Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> --- src/mesa/drivers/common/meta.c | 4 ++-- src/mesa/main/drawtex.c | 4 ++-- src/mesa/main/drawtex.h | 4 ++-- src/mesa/main/extensions.c | 2 +- src/mesa/main/mfeatures.h | 1 - src/mesa/main/texparam.c | 8 ++++---- src/mesa/state_tracker/st_cb_drawtex.c | 4 ++-- src/mesa/state_tracker/st_cb_drawtex.h | 4 ++-- src/mesa/state_tracker/st_extensions.c | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index f8e2634..36db966 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3738,7 +3738,7 @@ void _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) { -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 struct drawtex_state *drawtex = &ctx->Meta->DrawTex; struct vertex { GLfloat x, y, z, st[MAX_TEXTURE_UNITS][2]; @@ -3854,5 +3854,5 @@ _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 */ +#endif /* FEATURE_ES1 */ } diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c index 83485a9..9c88d25 100644 --- a/src/mesa/main/drawtex.c +++ b/src/mesa/main/drawtex.c @@ -28,7 +28,7 @@ #include "main/mtypes.h" -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 static void @@ -134,4 +134,4 @@ _mesa_DrawTexxv(const GLfixed *coords) (GLfloat) coords[4] / 65536.0f); } -#endif /* FEATURE_OES_draw_texture */ +#endif /* FEATURE_ES1 */ diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h index 13ff6f9..7d009d6 100644 --- a/src/mesa/main/drawtex.h +++ b/src/mesa/main/drawtex.h @@ -29,7 +29,7 @@ #include "mfeatures.h" -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 extern void GLAPIENTRY _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); @@ -55,7 +55,7 @@ _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 /* FEATURE_ES1 */ #endif /* DRAWTEX_H */ diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index d801f72..b9ee2c9 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -235,7 +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 +#if FEATURE_ES1 { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 }, #endif #if FEATURE_OES_EGL_image diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 578cb6a..fdecbd4 100644 --- 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 e6140eb..6a3b1a1 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -428,7 +428,7 @@ set_tex_parameteri(struct gl_context *ctx, } goto invalid_pname; -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 case GL_TEXTURE_CROP_RECT_OES: if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) goto invalid_pname; @@ -729,7 +729,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params) } break; -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 case GL_TEXTURE_CROP_RECT_OES: { /* convert float params to int */ @@ -1398,7 +1398,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) *params = obj->Sampler.LodBias; break; -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 case GL_TEXTURE_CROP_RECT_OES: if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) goto invalid_pname; @@ -1573,7 +1573,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) *params = (GLint) obj->Sampler.LodBias; break; -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 case GL_TEXTURE_CROP_RECT_OES: if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) goto invalid_pname; diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c index d57e629..fc5f0c2 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.c +++ b/src/mesa/state_tracker/st_cb_drawtex.c @@ -34,7 +34,7 @@ #include "cso_cache/cso_context.h" -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 struct cached_shader @@ -308,4 +308,4 @@ st_destroy_drawtex(struct st_context *st) } -#endif /* FEATURE_OES_draw_texture */ +#endif /* FEATURE_ES1 */ diff --git a/src/mesa/state_tracker/st_cb_drawtex.h b/src/mesa/state_tracker/st_cb_drawtex.h index 455da04..064075f 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.h +++ b/src/mesa/state_tracker/st_cb_drawtex.h @@ -16,7 +16,7 @@ struct dd_function_table; struct st_context; -#if FEATURE_OES_draw_texture +#if FEATURE_ES1 extern void st_init_drawtex_functions(struct dd_function_table *functions); @@ -36,6 +36,6 @@ st_destroy_drawtex(struct st_context *st) { } -#endif /* FEATURE_OES_draw_texture */ +#endif /* FEATURE_ES1 */ #endif /* ST_CB_DRAWTEX_H */ diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index ac11f12..e7c98a3 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -535,7 +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 +#if FEATURE_ES1 ctx->Extensions.OES_draw_texture = GL_TRUE; #endif -- 1.7.8.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev