[Mesa-dev] [PATCH v5 1/1] intel: add support for ANGLE_texture_compression_dxt.
Brian Paul
brianp at vmware.com
Fri Sep 28 07:35:50 PDT 2012
On 09/28/2012 08:24 AM, Oliver McFadden wrote:
> On Fri, Sep 28, 2012 at 07:54:14AM -0600, Brian Paul wrote:
>> On 09/28/2012 03:52 AM, Oliver McFadden wrote:
>>> Signed-off-by: Oliver McFadden<oliver.mcfadden at linux.intel.com>
>>> ---
>>> v5: reuse the _EXT defines instead of defining new _ANGLE defines.
>>> v5: removed unnessacary enum in glxextensions.h
>>
>> "unnessacary"
>
> Oops. Unnecessary.
>
>>
>>
>>>
>>> src/mapi/glapi/gen/es_EXT.xml | 6 ++++++
>>> src/mesa/drivers/dri/intel/intel_extensions.c | 1 +
>>> src/mesa/main/APIspec.xml | 3 +++
>>> src/mesa/main/extensions.c | 3 +++
>>> src/mesa/main/glformats.c | 6 ++++--
>>> src/mesa/main/mtypes.h | 1 +
>>> src/mesa/main/texformat.c | 9 ++++++---
>>> src/mesa/main/teximage.c | 11 +++++++++++
>>> 8 files changed, 35 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
>>> index fc2ec62..2698110 100644
>>> --- a/src/mapi/glapi/gen/es_EXT.xml
>>> +++ b/src/mapi/glapi/gen/es_EXT.xml
>>> @@ -731,4 +731,10 @@
>>> <enum name="RG8_EXT" value="0x822B"/>
>>> </category>
>>>
>>> +<!-- 111. GL_ANGLE_texture_compression_dxt -->
>>> +<category name="ANGLE_texture_compression_dxt" number="111">
>>> +<enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/>
>>> +<enum name="COMPRESSED_RGBA_S3TC_DXT5_ANGLE" value="0x83F3"/>
>>> +</category>
>>> +
>>> </OpenGLAPI>
>>> diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
>>> index 89f6c1e..8a46488 100755
>>> --- a/src/mesa/drivers/dri/intel/intel_extensions.c
>>> +++ b/src/mesa/drivers/dri/intel/intel_extensions.c
>>> @@ -182,6 +182,7 @@ intelInitExtensions(struct gl_context *ctx)
>>> }
>>>
>>> if (intel->ctx.Mesa_DXTn) {
>>> + ctx->Extensions.ANGLE_texture_compression_dxt = true;
>>> ctx->Extensions.EXT_texture_compression_s3tc = true;
>>> ctx->Extensions.S3_s3tc = true;
>>> }
>>> diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
>>> index a65c5c5..c396952 100644
>>> --- a/src/mesa/main/APIspec.xml
>>> +++ b/src/mesa/main/APIspec.xml
>>> @@ -2172,6 +2172,9 @@
>>> <category name="NV_draw_buffers"/>
>>> <category name="NV_read_buffer"/>
>>>
>>> + <!-- GL_ANGLE_texture_compression_dxt -->
>>> + <category name="ANGLE_texture_compression_dxt"/>
>>> +
>>> <function name="DrawBuffersNV" template="DrawBuffers"/>
>>> <function name="ReadBufferNV" template="ReadBuffer"/>
>>>
>>> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
>>> index bd7c7ba..4971ebc 100644
>>> --- a/src/mesa/main/extensions.c
>>> +++ b/src/mesa/main/extensions.c
>>> @@ -195,6 +195,8 @@ static const struct extension extension_table[] = {
>>> { "GL_EXT_texture3D", o(EXT_texture3D), GLL, 1996 },
>>> { "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 },
>>> { "GL_EXT_texture_compression_dxt1", o(EXT_texture_compression_s3tc), GL | ES1 | ES2, 2004 },
>>> + { "GL_ANGLE_texture_compression_dxt3", o(ANGLE_texture_compression_dxt), ES2, 2011 },
>>> + { "GL_ANGLE_texture_compression_dxt5", o(ANGLE_texture_compression_dxt), ES2, 2011 },
>>> { "GL_EXT_texture_compression_latc", o(EXT_texture_compression_latc), GL, 2006 },
>>> { "GL_EXT_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 },
>>> { "GL_EXT_texture_compression_s3tc", o(EXT_texture_compression_s3tc), GL, 2000 },
>>> @@ -480,6 +482,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
>>> ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
>>> _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
>>> if (ctx->Mesa_DXTn) {
>>> + ctx->Extensions.ANGLE_texture_compression_dxt = GL_TRUE;
>>> _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
>>> _mesa_enable_extension(ctx, "GL_S3_s3tc");
>>> }
>>> diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
>>> index 04029c0..ccdf56b 100644
>>> --- a/src/mesa/main/glformats.c
>>> +++ b/src/mesa/main/glformats.c
>>> @@ -791,8 +791,10 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
>>> return ctx->Extensions.EXT_texture_compression_s3tc;
>>> case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
>>> case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
>>> - return _mesa_is_desktop_gl(ctx)
>>> -&& ctx->Extensions.EXT_texture_compression_s3tc;
>>> + return (_mesa_is_desktop_gl(ctx)&&
>>> + ctx->Extensions.EXT_texture_compression_s3tc) ||
>>> + (ctx->API == API_OPENGLES2&&
>>> + ctx->Extensions.ANGLE_texture_compression_dxt);
>>> case GL_RGB_S3TC:
>>> case GL_RGB4_S3TC:
>>> case GL_RGBA_S3TC:
>>> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>>> index ba43e57..e790e18 100644
>>> --- a/src/mesa/main/mtypes.h
>>> +++ b/src/mesa/main/mtypes.h
>>> @@ -2946,6 +2946,7 @@ struct gl_extensions
>>> GLboolean dummy; /* don't remove this! */
>>> GLboolean dummy_true; /* Set true by _mesa_init_extensions(). */
>>> GLboolean dummy_false; /* Set false by _mesa_init_extensions(). */
>>> + GLboolean ANGLE_texture_compression_dxt;
>>> GLboolean ARB_ES2_compatibility;
>>> GLboolean ARB_base_instance;
>>> GLboolean ARB_blend_func_extended;
>>> diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
>>> index 17270ba..cc3687e 100644
>>> --- a/src/mesa/main/texformat.c
>>> +++ b/src/mesa/main/texformat.c
>>> @@ -302,7 +302,8 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
>>> }
>>> }
>>>
>>> - if (ctx->Extensions.EXT_texture_compression_s3tc) {
>>> + if (ctx->Extensions.EXT_texture_compression_s3tc ||
>>> + ctx->Extensions.ANGLE_texture_compression_dxt) {
>>> switch (internalFormat) {
>>> case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>>> RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
>>> @@ -604,12 +605,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
>>> RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
>>> break;
>>> case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>>> - if (ctx->Extensions.EXT_texture_compression_s3tc)
>>> + if (ctx->Extensions.EXT_texture_compression_s3tc ||
>>> + ctx->Extensions.ANGLE_texture_compression_dxt)
>>
>> Given what Ian said, don't you need an API==ES2 check here too?
>
> Hmm, yes... I will send a new patch on Monday; I am about the leave the
> office.
>
> I agree that we should write a function to disable extensions not
> applicable to the API, but I'm taking some flack to get this patch
> merged ASAP so I would rather use the API == ES2 check here as an
> intermediate solution, then implement the extension disabling function.
>
> I hope that is OK by you?
Understood. Sounds fine.
-Brian
More information about the mesa-dev
mailing list