mesa: remove FEATURE_OES_draw_texture define.

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

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 0d569b63ea54d4d091335ae4b3ccaeab7c3adbf7..1454154618af0ca0b37941bff9f461a336e92a85 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3807,7 +3807,6 @@ void
 _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
                    GLfloat width, GLfloat height)
 {
-#if FEATURE_OES_draw_texture
    struct drawtex_state *drawtex = &ctx->Meta->DrawTex;
    struct vertex {
       GLfloat x, y, z, st[MAX_TEXTURE_UNITS][2];
@@ -3923,5 +3922,4 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
    _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
    _mesa_meta_end(ctx);
-#endif /* FEATURE_OES_draw_texture */
 }

diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index 83485a928d8cf8af7d3cd8d56f4f39fc24ac60cd..d5cac22bd3bd89f57d59c69fbe1424d77a463851 100644 (file)
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -28,9 +28,6 @@
 #include "main/mtypes.h"
 
 
-#if FEATURE_OES_draw_texture
-
-
 static void
 draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
              GLfloat width, GLfloat height)
@@ -133,5 +130,3 @@ _mesa_DrawTexxv(const GLfixed *coords)
                 (GLfloat) coords[3] / 65536.0f,
                 (GLfloat) coords[4] / 65536.0f);
 }
-
-#endif /* FEATURE_OES_draw_texture */

diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h
index 13ff6f97e9e12656433bdc73186bd5e49804d0db..938b65fb2e96a3db3ebb5959700ee9ea3f2f9f23 100644 (file)
--- a/src/mesa/main/drawtex.h
+++ b/src/mesa/main/drawtex.h
@@ -29,8 +29,6 @@
 #include "mfeatures.h"
 
 
-#if FEATURE_OES_draw_texture
-
 extern void GLAPIENTRY
 _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
 
@@ -55,7 +53,5 @@ _mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
 extern void GLAPIENTRY
 _mesa_DrawTexxv(const GLfixed *coords);
 
-#endif /* FEATURE_OES_draw_texture */
-
 
 #endif /* DRAWTEX_H */

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index d1a1529433fbc1be3a39ff8004003b9da1152edd..dc5ea7843b3747e9a8ad9172bd88d4912d20620d 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -235,9 +235,7 @@ static const struct extension extension_table[] = {
    { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
    { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },
    { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },
-#if FEATURE_OES_draw_texture
    { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1,       2004 },
-#endif
 #if FEATURE_OES_EGL_image
    /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */
    { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 578cb6a4b9425d460d11c47c8b74e9610fee5360..fdecbd4181568a8ccab6c9bf290572e93718e9fa 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -111,7 +111,6 @@
 #define FEATURE_NV_vertex_program         FEATURE_GL
 
 #define FEATURE_OES_EGL_image             1
-#define FEATURE_OES_draw_texture          FEATURE_ES1
 #define FEATURE_OES_framebuffer_object    FEATURE_ES
 #define FEATURE_OES_mapbuffer             FEATURE_ES
 

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index e6140eb65f8d2e51a3d1680bd828bcab6753d480..63a63b732a5a47c3ecc305ef71a8769c2f1f53f6 100644 (file)
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -428,7 +428,6 @@ set_tex_parameteri(struct gl_context *ctx,
       }
       goto invalid_pname;
 
-#if FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
       if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
          goto invalid_pname;
@@ -438,7 +437,6 @@ set_tex_parameteri(struct gl_context *ctx,
       texObj->CropRect[2] = params[2];
       texObj->CropRect[3] = params[3];
       return GL_TRUE;
-#endif
 
    case GL_TEXTURE_SWIZZLE_R_EXT:
    case GL_TEXTURE_SWIZZLE_G_EXT:
@@ -728,8 +726,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
          need_update = set_tex_parameteri(ctx, texObj, pname, p);
       }
       break;
-
-#if FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
       {
          /* convert float params to int */
@@ -741,8 +737,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
          need_update = set_tex_parameteri(ctx, texObj, pname, iparams);
       }
       break;
-#endif
-
    case GL_TEXTURE_SWIZZLE_R_EXT:
    case GL_TEXTURE_SWIZZLE_G_EXT:
    case GL_TEXTURE_SWIZZLE_B_EXT:
@@ -1398,7 +1392,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
 
          *params = obj->Sampler.LodBias;
          break;
-#if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
          if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
             goto invalid_pname;
@@ -1408,7 +1401,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          params[2] = obj->CropRect[2];
          params[3] = obj->CropRect[3];
          break;
-#endif
 
       case GL_TEXTURE_SWIZZLE_R_EXT:
       case GL_TEXTURE_SWIZZLE_G_EXT:
@@ -1573,7 +1565,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
 
          *params = (GLint) obj->Sampler.LodBias;
          break;
-#if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
          if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
             goto invalid_pname;
@@ -1583,7 +1574,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          params[2] = obj->CropRect[2];
          params[3] = obj->CropRect[3];
          break;
-#endif
       case GL_TEXTURE_SWIZZLE_R_EXT:
       case GL_TEXTURE_SWIZZLE_G_EXT:
       case GL_TEXTURE_SWIZZLE_B_EXT:

diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c
index d57e629f1e8b5170e541e257fd653aba8b4e1990..e87de44063e05d80836417f6493bca3c52d1bcda 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/src/mesa/state_tracker/st_cb_drawtex.c
@@ -34,9 +34,6 @@
 #include "cso_cache/cso_context.h"
 
 
-#if FEATURE_OES_draw_texture
-
-
 struct cached_shader
 {
    void *handle;
@@ -306,6 +303,3 @@ st_destroy_drawtex(struct st_context *st)
    }
    NumCachedShaders = 0;
 }
-
-
-#endif /* FEATURE_OES_draw_texture */

diff --git a/src/mesa/state_tracker/st_cb_drawtex.h b/src/mesa/state_tracker/st_cb_drawtex.h
index 455da04e674ddae97f63279071826c5136d030c2..ccb615e983b113414c117341e6604049fab6425e 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawtex.h
+++ b/src/mesa/state_tracker/st_cb_drawtex.h
@@ -16,26 +16,10 @@
 struct dd_function_table;
 struct st_context;
 
-#if FEATURE_OES_draw_texture
-
 extern void
 st_init_drawtex_functions(struct dd_function_table *functions);
 
 extern void
 st_destroy_drawtex(struct st_context *st);
 
-#else
-
-static INLINE void
-st_init_drawtex_functions(struct dd_function_table *functions)
-{
-}
-
-static INLINE void
-st_destroy_drawtex(struct st_context *st)
-{
-}
-
-#endif /* FEATURE_OES_draw_texture */
-
 #endif /* ST_CB_DRAWTEX_H */

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index ac11f127c06c3f105610f4d125d3cc508f55e1bd..ead5145a18c80607c4a749672f6f2aaf1ea84548 100644 (file)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -535,9 +535,7 @@ void st_init_extensions(struct st_context *st)
    if (ctx->API != API_OPENGL)
       ctx->Extensions.OES_EGL_image_external = GL_TRUE;
 #endif
-#if FEATURE_OES_draw_texture
    ctx->Extensions.OES_draw_texture = GL_TRUE;
-#endif
 
    /* Expose the extensions which directly correspond to gallium caps. */
    for (i = 0; i < Elements(cap_mapping); i++) {