fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 22:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add texture gather changes

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Maxence Le Dore 2012-12-24 00:57:02 +01:00 • committed by Chris Forbes
parent 0d7fc10bcd
commit d3575622b7
8 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mapi/glapi/gen/ARB_texture_gather.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0"?>
<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
<OpenGLAPI>
<category name="GL_ARB_texture_gather" number="72">
<enum name="MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB" value="0x8E5E"/>
<enum name="MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB" value="0x8E5F"/>
<enum name="MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB" value="0x8F9F"/>
</category>
</OpenGLAPI>

2
src/mapi/glapi/gen/gl_API.xml
View file

@ -8189,7 +8189,7 @@
<!-- 70. GL_ARB_sample_shading -->
<xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 72. GL_ARB_texture_gather -->
<xi:include href="ARB_texture_gather.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 73. GL_ARB_texture_query_lod -->
<!-- ARB extension number 74 is a WGL extension. -->

4
src/mesa/main/context.c
View file

@ -652,6 +652,10 @@ _mesa_init_constants(struct gl_context *ctx)
ctx->Const.MinProgramTexelOffset = -8;
ctx->Const.MaxProgramTexelOffset = 7;
/* GL_ARB_texture_gather */
ctx->Const.MinProgramTextureGatherOffset = -8;
ctx->Const.MaxProgramTextureGatherOffset = 7;
/* GL_ARB_robustness */
ctx->Const.ResetStrategy = GL_NO_RESET_NOTIFICATION_ARB;

1
src/mesa/main/extensions.c
View file

@ -142,6 +142,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_texture_env_crossbar", o(ARB_texture_env_crossbar), GLL, 2001 },
{ "GL_ARB_texture_env_dot3", o(ARB_texture_env_dot3), GLL, 2001 },
{ "GL_ARB_texture_float", o(ARB_texture_float), GL, 2004 },
{ "GL_ARB_texture_gather", o(ARB_texture_gather), GL, 2009 },
{ "GL_ARB_texture_mirrored_repeat", o(dummy_true), GLL, 2001 },
{ "GL_ARB_texture_multisample", o(ARB_texture_multisample), GL, 2009 },
{ "GL_ARB_texture_non_power_of_two", o(ARB_texture_non_power_of_two), GL, 2003 },

1
src/mesa/main/get.c
View file

@ -366,6 +366,7 @@ EXTRA_EXT(ARB_map_buffer_alignment);
EXTRA_EXT(ARB_texture_cube_map_array);
EXTRA_EXT(ARB_texture_buffer_range);
EXTRA_EXT(ARB_texture_multisample);
EXTRA_EXT(ARB_texture_gather);
static const int
extra_ARB_color_buffer_float_or_glcore[] = {

6
src/mesa/main/get_hash_params.py
View file

@ -716,6 +716,12 @@ descriptor=[
# GL_ARB_texture_cube_map_array
[ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT, TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ],
# GL_ARB_texture_gather
[ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB", "CONTEXT_INT(Const.MinProgramTextureGatherOffset), extra_ARB_texture_gather"],
[ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"],
[ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherComponents), extra_ARB_texture_gather"],
]},
# Enums restricted to OpenGL Core profile

6
src/mesa/main/mtypes.h
View file

@ -3081,6 +3081,11 @@ struct gl_constants
/** GL_EXT_gpu_shader4 */
GLint MinProgramTexelOffset, MaxProgramTexelOffset;
/** GL_ARB_texture_gather */
GLuint MinProgramTextureGatherOffset;
GLuint MaxProgramTextureGatherOffset;
GLuint MaxProgramTextureGatherComponents;
/* GL_ARB_robustness */
GLenum ResetStrategy;
@ -3210,6 +3215,7 @@ struct gl_extensions
GLboolean ARB_texture_env_crossbar;
GLboolean ARB_texture_env_dot3;
GLboolean ARB_texture_float;
GLboolean ARB_texture_gather;
GLboolean ARB_texture_multisample;
GLboolean ARB_texture_non_power_of_two;
GLboolean ARB_texture_query_lod;

3
src/mesa/main/tests/enum_strings.cpp
View file

@ -1770,6 +1770,8 @@ const struct enum_info everything[] = {
{ 0x8E51, "GL_SAMPLE_MASK" },
{ 0x8E52, "GL_SAMPLE_MASK_VALUE" },
{ 0x8E59, "GL_MAX_SAMPLE_MASK_WORDS" },
{ 0x8E5E, "GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET" },
{ 0x8E5F, "GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET" },
{ 0x8F36, "GL_COPY_READ_BUFFER" },
{ 0x8F37, "GL_COPY_WRITE_BUFFER" },
{ 0x8F90, "GL_RED_SNORM" },
@ -1787,6 +1789,7 @@ const struct enum_info everything[] = {
{ 0x8F9C, "GL_SIGNED_NORMALIZED" },
{ 0x8F9D, "GL_PRIMITIVE_RESTART" },
{ 0x8F9E, "GL_PRIMITIVE_RESTART_INDEX" },
{ 0x8F9F, "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS" },
{ 0x906F, "GL_RGB10_A2UI" },
{ 0x9100, "GL_TEXTURE_2D_MULTISAMPLE" },
{ 0x9101, "GL_PROXY_TEXTURE_2D_MULTISAMPLE" },