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

intel: Clean-up ARB_texture_env_crossbar

Browse Source 
Enable support for ARB_texture_env_crossbar in the master extension
list instead of in every single device-specific list.
This commit is contained in:
Ian Romanick
2008-07-16 10:37:49 -07:00
parent 7d13dded5c
commit 29cb89d0c2
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/dri/i915/i830_context.c
View File

@@ -42,12 +42,6 @@
* Mesa's Driver Functions * Mesa's Driver Functions
***************************************/ ***************************************/
static const struct dri_extension i830_extensions[] = {
{"GL_ARB_texture_env_crossbar", NULL},
{NULL, NULL}
};
static void static void
i830InitDriverFunctions(struct dd_function_table *functions) i830InitDriverFunctions(struct dd_function_table *functions)
{ {
@@ -105,8 +99,6 @@ i830CreateContext(const __GLcontextModes * mesaVis,
intel->verts = TNL_CONTEXT(ctx)->clipspace.vertex_buf; intel->verts = TNL_CONTEXT(ctx)->clipspace.vertex_buf;
driInitExtensions(ctx, i830_extensions, GL_FALSE);
i830InitState(i830); i830InitState(i830);
i830InitMetaFuncs(i830); i830InitMetaFuncs(i830);

1
src/mesa/drivers/dri/i915/i915_context.c
View File

@@ -54,7 +54,6 @@ static const struct dri_extension i915_extensions[] = {
{"GL_ARB_depth_texture", NULL}, {"GL_ARB_depth_texture", NULL},
{"GL_ARB_fragment_program", NULL}, {"GL_ARB_fragment_program", NULL},
{"GL_ARB_shadow", NULL}, {"GL_ARB_shadow", NULL},
{"GL_ARB_texture_env_crossbar", NULL},
{"GL_ARB_texture_non_power_of_two", NULL}, {"GL_ARB_texture_non_power_of_two", NULL},
{"GL_EXT_shadow_funcs", NULL}, {"GL_EXT_shadow_funcs", NULL},
/* ARB extn won't work if not enabled */ /* ARB extn won't work if not enabled */

7
src/mesa/drivers/dri/intel/intel_context.c
View File

@@ -194,9 +194,8 @@ intelGetString(GLcontext * ctx, GLenum name)
/** /**
* Extension strings exported by the intel driver. * Extension strings exported by the intel driver.
* *
* \note * Extensions supported by all chips supported by i830_dri, i915_dri, or
* It appears that ARB_texture_env_crossbar has "disappeared" compared to the * i965_dri.
* old i830-specific driver.
*/ */
static const struct dri_extension card_extensions[] = { static const struct dri_extension card_extensions[] = {
{"GL_ARB_multisample", GL_ARB_multisample_functions}, {"GL_ARB_multisample", GL_ARB_multisample_functions},
@@ -208,6 +207,7 @@ static const struct dri_extension card_extensions[] = {
{"GL_ARB_texture_cube_map", NULL}, {"GL_ARB_texture_cube_map", NULL},
{"GL_ARB_texture_env_add", NULL}, {"GL_ARB_texture_env_add", NULL},
{"GL_ARB_texture_env_combine", NULL}, {"GL_ARB_texture_env_combine", NULL},
{"GL_ARB_texture_env_crossbar", NULL},
{"GL_ARB_texture_env_dot3", NULL}, {"GL_ARB_texture_env_dot3", NULL},
{"GL_ARB_texture_mirrored_repeat", NULL}, {"GL_ARB_texture_mirrored_repeat", NULL},
{"GL_ARB_texture_non_power_of_two", NULL }, {"GL_ARB_texture_non_power_of_two", NULL },
@@ -264,7 +264,6 @@ static const struct dri_extension brw_extensions[] = {
{ "GL_EXT_shadow_funcs", NULL }, { "GL_EXT_shadow_funcs", NULL },
/* ARB extn won't work if not enabled */ /* ARB extn won't work if not enabled */
{ "GL_SGIX_depth_texture", NULL }, { "GL_SGIX_depth_texture", NULL },
{ "GL_ARB_texture_env_crossbar", NULL },
{ "GL_EXT_texture_sRGB", NULL}, { "GL_EXT_texture_sRGB", NULL},
{ NULL, NULL } { NULL, NULL }
}; };