mesa: remove FEATURE_userclip define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 5dd883311149fb998d49e5dcaaff69281ef9992c..e0fd33bab2c56d167d85b363e94f35931fa0dd45 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -315,7 +315,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
             }
          }
          break;
-#if FEATURE_userclip
       case GL_CLIP_DISTANCE0:
       case GL_CLIP_DISTANCE1:
       case GL_CLIP_DISTANCE2:
@@ -345,7 +344,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
             }               
          }
          break;
-#endif
       case GL_COLOR_MATERIAL:
          if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES)
             goto invalid_enum_error;

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 5c3569c16a735f13b8cc861cdb71c5d3e1f530d6..76f5ea7cd6978d92cba65ad1451223a086b4fad3 100644 (file)
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -572,7 +572,6 @@ update_projection( struct gl_context *ctx )
 {
    _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
-#if FEATURE_userclip
    /* Recompute clip plane positions in clipspace.  This is also done
     * in _mesa_ClipPlane().
     */
@@ -586,7 +585,6 @@ update_projection( struct gl_context *ctx )
         }
       }
    }
-#endif
 }
 
 

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 2597583ec63142a5e789e4f91c0f692dbda9524c..b7acbee7e0f019f17aac8f5d08a6b7c996202496 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,8 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_userclip                  1
-
 #define FEATURE_accum                     FEATURE_GL
 #define FEATURE_arrayelt                  FEATURE_GL
 #define FEATURE_attrib_stack              FEATURE_GL