OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove FEATURE_OES_draw_texture define.

Browse Source 
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden
2012-09-11 09:49:44 +03:00
parent 009250a096
commit 5489fc7b9f
9 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/common/meta.c
View File

@@ -3807,7 +3807,6 @@ void
_mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height) GLfloat width, GLfloat height)
{ {
#if FEATURE_OES_draw_texture
struct drawtex_state *drawtex = &ctx->Meta->DrawTex; struct drawtex_state *drawtex = &ctx->Meta->DrawTex;
struct vertex { struct vertex {
GLfloat x, y, z, st[MAX_TEXTURE_UNITS][2]; 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_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
_mesa_meta_end(ctx); _mesa_meta_end(ctx);
#endif /* FEATURE_OES_draw_texture */
} }

5
src/mesa/main/drawtex.c
View File

@@ -28,9 +28,6 @@
#include "main/mtypes.h" #include "main/mtypes.h"
#if FEATURE_OES_draw_texture
static void static void
draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height) GLfloat width, GLfloat height)
@@ -133,5 +130,3 @@ _mesa_DrawTexxv(const GLfixed *coords)
(GLfloat) coords[3] / 65536.0f, (GLfloat) coords[3] / 65536.0f,
(GLfloat) coords[4] / 65536.0f); (GLfloat) coords[4] / 65536.0f);
} }
#endif /* FEATURE_OES_draw_texture */

4
src/mesa/main/drawtex.h
View File

@@ -29,8 +29,6 @@
#include "mfeatures.h" #include "mfeatures.h"
#if FEATURE_OES_draw_texture
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); _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 extern void GLAPIENTRY
_mesa_DrawTexxv(const GLfixed *coords); _mesa_DrawTexxv(const GLfixed *coords);
#endif /* FEATURE_OES_draw_texture */
#endif /* DRAWTEX_H */ #endif /* DRAWTEX_H */

2
src/mesa/main/extensions.c
View File

@@ -235,9 +235,7 @@ static const struct extension extension_table[] = {
{ "GL_OES_depth24", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_depth24", o(EXT_framebuffer_object), ES1 | ES2, 2005 },
{ "GL_OES_depth32", o(dummy_false), DISABLE, 2005 }, { "GL_OES_depth32", o(dummy_false), DISABLE, 2005 },
{ "GL_OES_depth_texture", o(ARB_depth_texture), ES2, 2006 }, { "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 }, { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 },
#endif
#if FEATURE_OES_EGL_image #if FEATURE_OES_EGL_image
/* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */ /* 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 }, { "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 },

1
src/mesa/main/mfeatures.h
View File

@@ -111,7 +111,6 @@
#define FEATURE_NV_vertex_program FEATURE_GL #define FEATURE_NV_vertex_program FEATURE_GL
#define FEATURE_OES_EGL_image 1 #define FEATURE_OES_EGL_image 1
#define FEATURE_OES_draw_texture FEATURE_ES1
#define FEATURE_OES_framebuffer_object FEATURE_ES #define FEATURE_OES_framebuffer_object FEATURE_ES
#define FEATURE_OES_mapbuffer FEATURE_ES #define FEATURE_OES_mapbuffer FEATURE_ES

10
src/mesa/main/texparam.c
View File

@@ -428,7 +428,6 @@ set_tex_parameteri(struct gl_context *ctx,
} }
goto invalid_pname; goto invalid_pname;
#if FEATURE_OES_draw_texture
case GL_TEXTURE_CROP_RECT_OES: case GL_TEXTURE_CROP_RECT_OES:
if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
goto invalid_pname; goto invalid_pname;
@@ -438,7 +437,6 @@ set_tex_parameteri(struct gl_context *ctx,
texObj->CropRect[2] = params[2]; texObj->CropRect[2] = params[2];
texObj->CropRect[3] = params[3]; texObj->CropRect[3] = params[3];
return GL_TRUE; return GL_TRUE;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT: case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_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); need_update = set_tex_parameteri(ctx, texObj, pname, p);
} }
break; break;
#if FEATURE_OES_draw_texture
case GL_TEXTURE_CROP_RECT_OES: case GL_TEXTURE_CROP_RECT_OES:
{ {
/* convert float params to int */ /* 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); need_update = set_tex_parameteri(ctx, texObj, pname, iparams);
} }
break; break;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT: case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT: case GL_TEXTURE_SWIZZLE_G_EXT:
case GL_TEXTURE_SWIZZLE_B_EXT: case GL_TEXTURE_SWIZZLE_B_EXT:
@@ -1398,7 +1392,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
*params = obj->Sampler.LodBias; *params = obj->Sampler.LodBias;
break; break;
#if FEATURE_OES_draw_texture
case GL_TEXTURE_CROP_RECT_OES: case GL_TEXTURE_CROP_RECT_OES:
if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
goto invalid_pname; goto invalid_pname;
@@ -1408,7 +1401,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
params[2] = obj->CropRect[2]; params[2] = obj->CropRect[2];
params[3] = obj->CropRect[3]; params[3] = obj->CropRect[3];
break; break;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT: case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT: case GL_TEXTURE_SWIZZLE_G_EXT:
@@ -1573,7 +1565,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
*params = (GLint) obj->Sampler.LodBias; *params = (GLint) obj->Sampler.LodBias;
break; break;
#if FEATURE_OES_draw_texture
case GL_TEXTURE_CROP_RECT_OES: case GL_TEXTURE_CROP_RECT_OES:
if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture) if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
goto invalid_pname; goto invalid_pname;
@@ -1583,7 +1574,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
params[2] = obj->CropRect[2]; params[2] = obj->CropRect[2];
params[3] = obj->CropRect[3]; params[3] = obj->CropRect[3];
break; break;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT: case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT: case GL_TEXTURE_SWIZZLE_G_EXT:
case GL_TEXTURE_SWIZZLE_B_EXT: case GL_TEXTURE_SWIZZLE_B_EXT:

6
src/mesa/state_tracker/st_cb_drawtex.c
View File

@@ -34,9 +34,6 @@
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#if FEATURE_OES_draw_texture
struct cached_shader struct cached_shader
{ {
void *handle; void *handle;
@@ -306,6 +303,3 @@ st_destroy_drawtex(struct st_context *st)
} }
NumCachedShaders = 0; NumCachedShaders = 0;
} }
#endif /* FEATURE_OES_draw_texture */

16
src/mesa/state_tracker/st_cb_drawtex.h
View File

@@ -16,26 +16,10 @@
struct dd_function_table; struct dd_function_table;
struct st_context; struct st_context;
#if FEATURE_OES_draw_texture
extern void extern void
st_init_drawtex_functions(struct dd_function_table *functions); st_init_drawtex_functions(struct dd_function_table *functions);
extern void extern void
st_destroy_drawtex(struct st_context *st); 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 */ #endif /* ST_CB_DRAWTEX_H */

2
src/mesa/state_tracker/st_extensions.c
View File

@@ -535,9 +535,7 @@ void st_init_extensions(struct st_context *st)
if (ctx->API != API_OPENGL) if (ctx->API != API_OPENGL)
ctx->Extensions.OES_EGL_image_external = GL_TRUE; ctx->Extensions.OES_EGL_image_external = GL_TRUE;
#endif #endif
#if FEATURE_OES_draw_texture
ctx->Extensions.OES_draw_texture = GL_TRUE; ctx->Extensions.OES_draw_texture = GL_TRUE;
#endif
/* Expose the extensions which directly correspond to gallium caps. */ /* Expose the extensions which directly correspond to gallium caps. */
for (i = 0; i < Elements(cap_mapping); i++) { for (i = 0; i < Elements(cap_mapping); i++) {