This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 4b0ad2c6d236da878eedbae8ff8c940a9050f848
Author: m4n4t4...@gmail.com 
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Nov 17 19:52:07 2014 +0000

    All: Remove unfinished OpenGL display list code
---
 MP/code/rend2/tr_local.h      |  7 +------
 MP/code/rend2/tr_surface.c    |  7 -------
 MP/code/renderer/tr_local.h   |  8 +-------
 MP/code/renderer/tr_surface.c | 17 +++--------------
 SP/code/rend2/tr_local.h      |  7 +------
 SP/code/rend2/tr_surface.c    |  7 -------
 SP/code/renderer/tr_local.h   |  8 +-------
 SP/code/renderer/tr_surface.c | 17 +++--------------
 8 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index 5994c64..77da8c2 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -958,7 +958,6 @@ typedef enum {
        SF_IQM,
        SF_FLARE,
        SF_ENTITY,              // beams, rails, lightning, etc that can be 
determined by entity
-       SF_DISPLAY_LIST,
        SF_VAO_MESH,
        SF_VAO_MDVMESH,
 
@@ -987,11 +986,6 @@ typedef struct srfPoly_s {
        polyVert_t      *verts;
 } srfPoly_t;
 
-typedef struct srfDisplayList_s {
-       surfaceType_t surfaceType;
-       int listNum;
-} srfDisplayList_t;
-
 
 typedef struct srfFlare_s {
        surfaceType_t surfaceType;
@@ -1000,6 +994,7 @@ typedef struct srfFlare_s {
        vec3_t color;
 } srfFlare_t;
 
+
 typedef struct
 {
        vec3_t          xyz;
diff --git a/MP/code/rend2/tr_surface.c b/MP/code/rend2/tr_surface.c
index d22cc2c..d2e9ba2 100644
--- a/MP/code/rend2/tr_surface.c
+++ b/MP/code/rend2/tr_surface.c
@@ -1912,12 +1912,6 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
        glState.vertexAnimation = qfalse;
 }
 
-static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-       // all apropriate state must be set in RB_BeginSurface
-       // this isn't implemented yet...
-       qglCallList( surf->listNum );
-}
-
 static void RB_SurfaceSkip( void *surf ) {
 }
 
@@ -1936,7 +1930,6 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) 
= {
        ( void( * ) ( void* ) )RB_IQMSurfaceAnim,       // SF_IQM,
        ( void( * ) ( void* ) )RB_SurfaceFlare,         // SF_FLARE,
        ( void( * ) ( void* ) )RB_SurfaceEntity,        // SF_ENTITY
-       ( void( * ) ( void* ) )RB_SurfaceDisplayList,   // SF_DISPLAY_LIST
        ( void( * ) ( void* ) )RB_SurfaceVaoMesh,       // SF_VAO_MESH,
        ( void( * ) ( void* ) )RB_SurfaceVaoMdvMesh,    // SF_VAO_MDVMESH
 };
diff --git a/MP/code/renderer/tr_local.h b/MP/code/renderer/tr_local.h
index ded82f3..2bcea8b 100644
--- a/MP/code/renderer/tr_local.h
+++ b/MP/code/renderer/tr_local.h
@@ -580,7 +580,6 @@ typedef enum {
        SF_IQM,
        SF_FLARE,
        SF_ENTITY,              // beams, rails, lightning, etc that can be 
determined by entity
-       SF_DISPLAY_LIST,
 
        SF_NUM_SURFACE_TYPES,
        SF_MAX = 0xffffffff         // ensures that sizeof( surfaceType_t ) == 
sizeof( int )
@@ -606,11 +605,6 @@ typedef struct srfPoly_s {
        polyVert_t      *verts;
 } srfPoly_t;
 
-typedef struct srfDisplayList_s {
-       surfaceType_t surfaceType;
-       int listNum;
-} srfDisplayList_t;
-
 
 typedef struct srfFlare_s {
        surfaceType_t surfaceType;
@@ -619,6 +613,7 @@ typedef struct srfFlare_s {
        vec3_t color;
 } srfFlare_t;
 
+
 typedef struct srfGridMesh_s {
        surfaceType_t surfaceType;
 
@@ -646,7 +641,6 @@ typedef struct srfGridMesh_s {
 } srfGridMesh_t;
 
 
-
 #define VERTEXSIZE  8
 typedef struct {
        surfaceType_t surfaceType;
diff --git a/MP/code/renderer/tr_surface.c b/MP/code/renderer/tr_surface.c
index 362a9ef..36c9771 100644
--- a/MP/code/renderer/tr_surface.c
+++ b/MP/code/renderer/tr_surface.c
@@ -1505,16 +1505,6 @@ static void RB_SurfaceFlare( srfFlare_t *surf ) {
                RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 1.0f, 
surf->normal, 0, qtrue);
 }
 
-static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-#ifdef VCMODS_OPENGLES
-   assert(0);
-#else
-       // all apropriate state must be set in RB_BeginSurface
-       // this isn't implemented yet...
-       qglCallList( surf->listNum );
-#endif
-}
-
 static void RB_SurfaceSkip( void *surf ) {
 }
 
@@ -1529,9 +1519,8 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) 
= {
        ( void( * ) ( void* ) )RB_SurfaceMesh,         // SF_MD3,
        ( void( * ) ( void* ) )RB_SurfaceCMesh,        // SF_MDC,
        ( void( * ) ( void* ) )RB_SurfaceAnim,         // SF_MDS,
-       ( void( * ) ( void* ) )RB_MDRSurfaceAnim,       // SF_MDR,
-       ( void( * ) ( void* ) )RB_IQMSurfaceAnim,       // SF_IQM,
+       ( void( * ) ( void* ) )RB_MDRSurfaceAnim,      // SF_MDR,
+       ( void( * ) ( void* ) )RB_IQMSurfaceAnim,      // SF_IQM,
        ( void( * ) ( void* ) )RB_SurfaceFlare,        // SF_FLARE,
-       ( void( * ) ( void* ) )RB_SurfaceEntity,       // SF_ENTITY
-       ( void( * ) ( void* ) )RB_SurfaceDisplayList   // SF_DISPLAY_LIST
+       ( void( * ) ( void* ) )RB_SurfaceEntity        // SF_ENTITY
 };
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 6c6e2ab..366f6e9 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -964,7 +964,6 @@ typedef enum {
        SF_IQM,
        SF_FLARE,
        SF_ENTITY,              // beams, rails, lightning, etc that can be 
determined by entity
-       SF_DISPLAY_LIST,
        SF_VAO_MESH,
        SF_VAO_MDVMESH,
 
@@ -993,11 +992,6 @@ typedef struct srfPoly_s {
        polyVert_t      *verts;
 } srfPoly_t;
 
-typedef struct srfDisplayList_s {
-       surfaceType_t surfaceType;
-       int listNum;
-} srfDisplayList_t;
-
 
 typedef struct srfFlare_s {
        surfaceType_t surfaceType;
@@ -1006,6 +1000,7 @@ typedef struct srfFlare_s {
        vec3_t color;
 } srfFlare_t;
 
+
 typedef struct
 {
        vec3_t          xyz;
diff --git a/SP/code/rend2/tr_surface.c b/SP/code/rend2/tr_surface.c
index 7c9bc05..3dabab5 100644
--- a/SP/code/rend2/tr_surface.c
+++ b/SP/code/rend2/tr_surface.c
@@ -1909,12 +1909,6 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
        glState.vertexAnimation = qfalse;
 }
 
-static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-       // all apropriate state must be set in RB_BeginSurface
-       // this isn't implemented yet...
-       qglCallList( surf->listNum );
-}
-
 static void RB_SurfaceSkip( void *surf ) {
 }
 
@@ -1933,7 +1927,6 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) 
= {
        ( void( * ) ( void* ) )RB_IQMSurfaceAnim,       // SF_IQM,
        ( void( * ) ( void* ) )RB_SurfaceFlare,         // SF_FLARE,
        ( void( * ) ( void* ) )RB_SurfaceEntity,        // SF_ENTITY
-       ( void( * ) ( void* ) )RB_SurfaceDisplayList,   // SF_DISPLAY_LIST
        ( void( * ) ( void* ) )RB_SurfaceVaoMesh,       // SF_VAO_MESH,
        ( void( * ) ( void* ) )RB_SurfaceVaoMdvMesh,    // SF_VAO_MDVMESH
 };
diff --git a/SP/code/renderer/tr_local.h b/SP/code/renderer/tr_local.h
index 4f9cafb..c263f44 100644
--- a/SP/code/renderer/tr_local.h
+++ b/SP/code/renderer/tr_local.h
@@ -586,7 +586,6 @@ typedef enum {
        SF_IQM,
        SF_FLARE,
        SF_ENTITY,              // beams, rails, lightning, etc that can be 
determined by entity
-       SF_DISPLAY_LIST,
 
        SF_NUM_SURFACE_TYPES,
        SF_MAX = 0xffffffff         // ensures that sizeof( surfaceType_t ) == 
sizeof( int )
@@ -612,11 +611,6 @@ typedef struct srfPoly_s {
        polyVert_t      *verts;
 } srfPoly_t;
 
-typedef struct srfDisplayList_s {
-       surfaceType_t surfaceType;
-       int listNum;
-} srfDisplayList_t;
-
 
 typedef struct srfFlare_s {
        surfaceType_t surfaceType;
@@ -625,6 +619,7 @@ typedef struct srfFlare_s {
        vec3_t color;
 } srfFlare_t;
 
+
 typedef struct srfGridMesh_s {
        surfaceType_t surfaceType;
 
@@ -652,7 +647,6 @@ typedef struct srfGridMesh_s {
 } srfGridMesh_t;
 
 
-
 #define VERTEXSIZE  8
 typedef struct {
        surfaceType_t surfaceType;
diff --git a/SP/code/renderer/tr_surface.c b/SP/code/renderer/tr_surface.c
index f4a3ca6..1a23b87 100644
--- a/SP/code/renderer/tr_surface.c
+++ b/SP/code/renderer/tr_surface.c
@@ -1504,16 +1504,6 @@ static void RB_SurfaceFlare( srfFlare_t *surf ) {
                RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 1.0f, 
surf->normal, 0, qtrue);
 }
 
-static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-#ifdef VCMODS_OPENGLES
-   assert(0);
-#else
-       // all apropriate state must be set in RB_BeginSurface
-       // this isn't implemented yet...
-       qglCallList( surf->listNum );
-#endif
-}
-
 static void RB_SurfaceSkip( void *surf ) {
 }
 
@@ -1528,9 +1518,8 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) 
= {
        ( void( * ) ( void* ) )RB_SurfaceMesh,         // SF_MD3,
        ( void( * ) ( void* ) )RB_SurfaceCMesh,        // SF_MDC,
        ( void( * ) ( void* ) )RB_SurfaceAnim,         // SF_MDS,
-       ( void( * ) ( void* ) )RB_MDRSurfaceAnim,       // SF_MDR,
-       ( void( * ) ( void* ) )RB_IQMSurfaceAnim,       // SF_IQM,
+       ( void( * ) ( void* ) )RB_MDRSurfaceAnim,      // SF_MDR,
+       ( void( * ) ( void* ) )RB_IQMSurfaceAnim,      // SF_IQM,
        ( void( * ) ( void* ) )RB_SurfaceFlare,        // SF_FLARE,
-       ( void( * ) ( void* ) )RB_SurfaceEntity,       // SF_ENTITY
-       ( void( * ) ( void* ) )RB_SurfaceDisplayList   // SF_DISPLAY_LIST
+       ( void( * ) ( void* ) )RB_SurfaceEntity        // SF_ENTITY
 };

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to