diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-02 10:53:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-02 10:53:27 +0000 |
| commit | 43fb99508848b8e9f4ced9a7e7a6c3692047fbf1 (patch) | |
| tree | 8cba41c6dda06adfd2a2f88eff6e54ab6d4204cf /mesalib/src/mesa/main/extensions.c | |
| parent | 717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (diff) | |
| parent | 56950d7bed70ee82186f44f9333537cdbb33c448 (diff) | |
| download | vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.gz vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.bz2 vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/extensions.c')
| -rw-r--r-- | mesalib/src/mesa/main/extensions.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 1b540e99a..a4aa9847a 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -241,8 +241,7 @@ static const struct extension extension_table[] = { { "GL_OES_stencil4", o(dummy_false), DISABLE },
{ "GL_OES_stencil8", o(EXT_framebuffer_object), ES1 | ES2 },
{ "GL_OES_stencil_wrap", o(EXT_stencil_wrap), ES1 },
- /* GL_OES_texture_3D is disabled due to missing GLSL support. */
- { "GL_OES_texture_3D", o(EXT_texture3D), DISABLE },
+ { "GL_OES_texture_3D", o(EXT_texture3D), ES2 },
{ "GL_OES_texture_cube_map", o(ARB_texture_cube_map), ES1 },
{ "GL_OES_texture_env_crossbar", o(ARB_texture_env_crossbar), ES1 },
{ "GL_OES_texture_mirrored_repeat", o(ARB_texture_mirrored_repeat), ES1 },
@@ -291,7 +290,6 @@ static const struct extension extension_table[] = { { "GL_SGIS_texture_border_clamp", o(ARB_texture_border_clamp), GL },
{ "GL_SGIS_texture_edge_clamp", o(SGIS_texture_edge_clamp), GL },
{ "GL_SGIS_texture_lod", o(SGIS_texture_lod), GL },
- { "GL_SGI_texture_color_table", o(SGI_texture_color_table), GL },
{ "GL_SUN_multi_draw_arrays", o(EXT_multi_draw_arrays), GL },
{ 0, 0, 0 },
@@ -521,7 +519,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) #if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
ctx->Extensions.NV_fragment_program_option = GL_TRUE;
#endif
- ctx->Extensions.SGI_texture_color_table = GL_TRUE;
/*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
|