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

mesa: add checks for GL_EXT_texture_array

Browse Source 
In case the driver enables GL_MESA_texture_array but not the EXT version.
This commit is contained in:
Brian Paul
2011-01-25 18:07:45 -07:00
parent 0f4b2a0a23
commit f2dd11817a
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mesa/main/teximage.c
View File

@@ -703,6 +703,9 @@ _mesa_select_tex_object(struct gl_context *ctx,
const struct gl_texture_unit *texUnit, const struct gl_texture_unit *texUnit,
GLenum target) GLenum target)
{ {
const GLboolean arrayTex = (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array);
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
return texUnit->CurrentTex[TEXTURE_1D_INDEX]; return texUnit->CurrentTex[TEXTURE_1D_INDEX];
@@ -735,17 +738,13 @@ _mesa_select_tex_object(struct gl_context *ctx,
return ctx->Extensions.NV_texture_rectangle return ctx->Extensions.NV_texture_rectangle
? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL; ? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL;
case GL_TEXTURE_1D_ARRAY_EXT: case GL_TEXTURE_1D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array return arrayTex ? texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
? texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
case GL_PROXY_TEXTURE_1D_ARRAY_EXT: case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array return arrayTex ? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array return arrayTex ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
case GL_PROXY_TEXTURE_2D_ARRAY_EXT: case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array return arrayTex ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
default: default:
_mesa_problem(NULL, "bad target in _mesa_select_tex_object()"); _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
return NULL; return NULL;
@@ -930,7 +929,8 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
case GL_PROXY_TEXTURE_1D_ARRAY_EXT: case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
case GL_PROXY_TEXTURE_2D_ARRAY_EXT: case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array)
? ctx->Const.MaxTextureLevels : 0; ? ctx->Const.MaxTextureLevels : 0;
default: default:
return 0; /* bad target */ return 0; /* bad target */
@@ -1382,7 +1382,8 @@ target_can_be_compressed(const struct gl_context *ctx, GLenum target,
return ctx->Extensions.ARB_texture_cube_map; return ctx->Extensions.ARB_texture_cube_map;
case GL_PROXY_TEXTURE_2D_ARRAY_EXT: case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array; return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.MESA_texture_array);
default: default:
return GL_FALSE; return GL_FALSE;
} }
@@ -1423,7 +1424,8 @@ legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
return ctx->Extensions.NV_texture_rectangle; return ctx->Extensions.NV_texture_rectangle;
case GL_TEXTURE_1D_ARRAY_EXT: case GL_TEXTURE_1D_ARRAY_EXT:
case GL_PROXY_TEXTURE_1D_ARRAY_EXT: case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array; return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array);
default: default:
return GL_FALSE; return GL_FALSE;
} }
@@ -1434,7 +1436,8 @@ legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
return GL_TRUE; return GL_TRUE;
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
case GL_PROXY_TEXTURE_2D_ARRAY_EXT: case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array; return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array);
default: default:
return GL_FALSE; return GL_FALSE;
} }
@@ -1471,7 +1474,8 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
case GL_TEXTURE_RECTANGLE_NV: case GL_TEXTURE_RECTANGLE_NV:
return ctx->Extensions.NV_texture_rectangle; return ctx->Extensions.NV_texture_rectangle;
case GL_TEXTURE_1D_ARRAY_EXT: case GL_TEXTURE_1D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array; return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array);
default: default:
return GL_FALSE; return GL_FALSE;
} }
@@ -1480,7 +1484,8 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
return GL_TRUE; return GL_TRUE;
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
return ctx->Extensions.MESA_texture_array; return (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array);
default: default:
return GL_FALSE; return GL_FALSE;
} }

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

@@ -116,12 +116,14 @@ get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
} }
break; break;
case GL_TEXTURE_1D_ARRAY_EXT: case GL_TEXTURE_1D_ARRAY_EXT:
if (ctx->Extensions.MESA_texture_array) { if (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array) {
return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX]; return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
} }
break; break;
case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_2D_ARRAY_EXT:
if (ctx->Extensions.MESA_texture_array) { if (ctx->Extensions.MESA_texture_array ||
ctx->Extensions.EXT_texture_array) {
return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX]; return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
} }
break; break;