From 820789ac69a72f6ea8081db6f82827da6c7d7110 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sun, 21 Aug 2011 21:45:21 +0800 Subject: intel: rename intel_extensions_es2.c to intel_extensions_es.c We'd like to add intelInitExtensionsES1 to it later. Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i915/Makefile.sources | 2 +- src/mesa/drivers/dri/i915/intel_extensions_es.c | 1 + src/mesa/drivers/dri/i915/intel_extensions_es2.c | 1 - src/mesa/drivers/dri/i965/Makefile.sources | 2 +- src/mesa/drivers/dri/i965/intel_extensions_es.c | 1 + src/mesa/drivers/dri/i965/intel_extensions_es2.c | 1 - src/mesa/drivers/dri/intel/intel_extensions_es.c | 110 ++++++++++++++++++++++ src/mesa/drivers/dri/intel/intel_extensions_es2.c | 110 ---------------------- 8 files changed, 114 insertions(+), 114 deletions(-) create mode 120000 src/mesa/drivers/dri/i915/intel_extensions_es.c delete mode 120000 src/mesa/drivers/dri/i915/intel_extensions_es2.c create mode 120000 src/mesa/drivers/dri/i965/intel_extensions_es.c delete mode 120000 src/mesa/drivers/dri/i965/intel_extensions_es2.c create mode 100644 src/mesa/drivers/dri/intel/intel_extensions_es.c delete mode 100644 src/mesa/drivers/dri/intel/intel_extensions_es2.c diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources index 8aee589cf8..c5b9c1fea2 100644 --- a/src/mesa/drivers/dri/i915/Makefile.sources +++ b/src/mesa/drivers/dri/i915/Makefile.sources @@ -14,7 +14,7 @@ i915_C_SOURCES := \ intel_batchbuffer.c \ intel_clear.c \ intel_extensions.c \ - intel_extensions_es2.c \ + intel_extensions_es.c \ intel_mipmap_tree.c \ intel_tex_layout.c \ intel_tex_image.c \ diff --git a/src/mesa/drivers/dri/i915/intel_extensions_es.c b/src/mesa/drivers/dri/i915/intel_extensions_es.c new file mode 120000 index 0000000000..4924f7bdb4 --- /dev/null +++ b/src/mesa/drivers/dri/i915/intel_extensions_es.c @@ -0,0 +1 @@ +../intel/intel_extensions_es.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/i915/intel_extensions_es2.c b/src/mesa/drivers/dri/i915/intel_extensions_es2.c deleted file mode 120000 index 0ec1ceee78..0000000000 --- a/src/mesa/drivers/dri/i915/intel_extensions_es2.c +++ /dev/null @@ -1 +0,0 @@ -../intel/intel_extensions_es2.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index e9bd7074f1..6917286ff2 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -11,7 +11,7 @@ i965_C_SOURCES := \ intel_context.c \ intel_decode.c \ intel_extensions.c \ - intel_extensions_es2.c \ + intel_extensions_es.c \ intel_fbo.c \ intel_mipmap_tree.c \ intel_regions.c \ diff --git a/src/mesa/drivers/dri/i965/intel_extensions_es.c b/src/mesa/drivers/dri/i965/intel_extensions_es.c new file mode 120000 index 0000000000..4924f7bdb4 --- /dev/null +++ b/src/mesa/drivers/dri/i965/intel_extensions_es.c @@ -0,0 +1 @@ +../intel/intel_extensions_es.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/i965/intel_extensions_es2.c b/src/mesa/drivers/dri/i965/intel_extensions_es2.c deleted file mode 120000 index 0ec1ceee78..0000000000 --- a/src/mesa/drivers/dri/i965/intel_extensions_es2.c +++ /dev/null @@ -1 +0,0 @@ -../intel/intel_extensions_es2.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/intel/intel_extensions_es.c b/src/mesa/drivers/dri/intel/intel_extensions_es.c new file mode 100644 index 0000000000..5ef6b0561d --- /dev/null +++ b/src/mesa/drivers/dri/intel/intel_extensions_es.c @@ -0,0 +1,110 @@ +/************************************************************************** + * + * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + +#include "main/extensions.h" +#include "main/mfeatures.h" + +#include "intel_extensions.h" + +static const char *es2_extensions[] = { + /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */ + "GL_ARB_draw_buffers", + "GL_ARB_multisample", + "GL_ARB_texture_compression", + "GL_ARB_transpose_matrix", + "GL_ARB_vertex_buffer_object", + "GL_ARB_window_pos", + "GL_EXT_blend_func_separate", + "GL_EXT_compiled_vertex_array", + "GL_EXT_framebuffer_blit", + "GL_EXT_multi_draw_arrays", + "GL_EXT_polygon_offset", + "GL_EXT_texture_object", + "GL_EXT_vertex_array", + "GL_IBM_multimode_draw_arrays", + "GL_MESA_window_pos", + "GL_NV_vertex_program", + + /* Required by GLES2 */ + "GL_ARB_fragment_program", + "GL_ARB_fragment_shader", + "GL_ARB_multitexture", + "GL_ARB_shader_objects", + "GL_ARB_texture_cube_map", + "GL_ARB_texture_mirrored_repeat", + "GL_ARB_texture_non_power_of_two", + "GL_ARB_vertex_shader", + "GL_EXT_blend_color", + "GL_EXT_blend_equation_separate", + "GL_EXT_blend_minmax", + "GL_EXT_blend_subtract", + "GL_EXT_stencil_wrap", + "GL_NV_blend_square", + + /* Optional GLES2 */ + "GL_ARB_framebuffer_object", + "GL_EXT_texture_filter_anisotropic", + "GL_ARB_depth_texture", + "GL_EXT_packed_depth_stencil", + "GL_EXT_framebuffer_object", + "GL_EXT_texture_format_BGRA8888", + +#if FEATURE_OES_EGL_image + "GL_OES_EGL_image", +#endif + + NULL, +}; + +/** + * \brief Extensions to disable. + * + * These extensions must be manually disabled because they may have been + * enabled by default. + */ +static const char* es2_extensions_disabled[] = { + "GL_OES_standard_derivatives", + NULL, +}; + +/** + * Initializes potential list of extensions if ctx == NULL, or actually enables + * extensions for a context. + */ +void +intelInitExtensionsES2(struct gl_context *ctx) +{ + int i; + + /* Can't use driInitExtensions() since it uses extensions from + * main/remap_helper.h when called the first time. */ + + for (i = 0; es2_extensions[i]; i++) + _mesa_enable_extension(ctx, es2_extensions[i]); + for (i = 0; es2_extensions_disabled[i]; i++) + _mesa_disable_extension(ctx, es2_extensions_disabled[i]); +} diff --git a/src/mesa/drivers/dri/intel/intel_extensions_es2.c b/src/mesa/drivers/dri/intel/intel_extensions_es2.c deleted file mode 100644 index 5ef6b0561d..0000000000 --- a/src/mesa/drivers/dri/intel/intel_extensions_es2.c +++ /dev/null @@ -1,110 +0,0 @@ -/************************************************************************** - * - * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -#include "main/extensions.h" -#include "main/mfeatures.h" - -#include "intel_extensions.h" - -static const char *es2_extensions[] = { - /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */ - "GL_ARB_draw_buffers", - "GL_ARB_multisample", - "GL_ARB_texture_compression", - "GL_ARB_transpose_matrix", - "GL_ARB_vertex_buffer_object", - "GL_ARB_window_pos", - "GL_EXT_blend_func_separate", - "GL_EXT_compiled_vertex_array", - "GL_EXT_framebuffer_blit", - "GL_EXT_multi_draw_arrays", - "GL_EXT_polygon_offset", - "GL_EXT_texture_object", - "GL_EXT_vertex_array", - "GL_IBM_multimode_draw_arrays", - "GL_MESA_window_pos", - "GL_NV_vertex_program", - - /* Required by GLES2 */ - "GL_ARB_fragment_program", - "GL_ARB_fragment_shader", - "GL_ARB_multitexture", - "GL_ARB_shader_objects", - "GL_ARB_texture_cube_map", - "GL_ARB_texture_mirrored_repeat", - "GL_ARB_texture_non_power_of_two", - "GL_ARB_vertex_shader", - "GL_EXT_blend_color", - "GL_EXT_blend_equation_separate", - "GL_EXT_blend_minmax", - "GL_EXT_blend_subtract", - "GL_EXT_stencil_wrap", - "GL_NV_blend_square", - - /* Optional GLES2 */ - "GL_ARB_framebuffer_object", - "GL_EXT_texture_filter_anisotropic", - "GL_ARB_depth_texture", - "GL_EXT_packed_depth_stencil", - "GL_EXT_framebuffer_object", - "GL_EXT_texture_format_BGRA8888", - -#if FEATURE_OES_EGL_image - "GL_OES_EGL_image", -#endif - - NULL, -}; - -/** - * \brief Extensions to disable. - * - * These extensions must be manually disabled because they may have been - * enabled by default. - */ -static const char* es2_extensions_disabled[] = { - "GL_OES_standard_derivatives", - NULL, -}; - -/** - * Initializes potential list of extensions if ctx == NULL, or actually enables - * extensions for a context. - */ -void -intelInitExtensionsES2(struct gl_context *ctx) -{ - int i; - - /* Can't use driInitExtensions() since it uses extensions from - * main/remap_helper.h when called the first time. */ - - for (i = 0; es2_extensions[i]; i++) - _mesa_enable_extension(ctx, es2_extensions[i]); - for (i = 0; es2_extensions_disabled[i]; i++) - _mesa_disable_extension(ctx, es2_extensions_disabled[i]); -} -- cgit v1.2.3