Bug 1111689 - Part 1: Let EXT_shader_texture_lod play when ARB_shader_texture_lod can play. r=jgilbert

This commit is contained in:
Milan Sreckovic 2015-02-09 17:53:38 +08:00
parent 794c9eb870
commit 4d0c7fef14
4 changed files with 15 additions and 1 deletions

View File

@ -116,7 +116,7 @@ WebGLContext::IsExtensionSupported(WebGLExtensionID ext) const
case WebGLExtensionID::EXT_frag_depth: case WebGLExtensionID::EXT_frag_depth:
return WebGLExtensionFragDepth::IsSupported(this); return WebGLExtensionFragDepth::IsSupported(this);
case WebGLExtensionID::EXT_shader_texture_lod: case WebGLExtensionID::EXT_shader_texture_lod:
return gl->IsExtensionSupported(gl::GLContext::EXT_shader_texture_lod); return gl->IsSupported(gl::GLFeature::shader_texture_lod);
case WebGLExtensionID::EXT_sRGB: case WebGLExtensionID::EXT_sRGB:
return WebGLExtensionSRGB::IsSupported(this); return WebGLExtensionSRGB::IsSupported(this);
case WebGLExtensionID::EXT_texture_filter_anisotropic: case WebGLExtensionID::EXT_texture_filter_anisotropic:

View File

@ -99,6 +99,7 @@ static const char *sExtensionNames[] = {
"GL_ARB_pixel_buffer_object", "GL_ARB_pixel_buffer_object",
"GL_ARB_robustness", "GL_ARB_robustness",
"GL_ARB_sampler_objects", "GL_ARB_sampler_objects",
"GL_ARB_shader_texture_lod",
"GL_ARB_sync", "GL_ARB_sync",
"GL_ARB_texture_compression", "GL_ARB_texture_compression",
"GL_ARB_texture_float", "GL_ARB_texture_float",

View File

@ -122,6 +122,7 @@ enum class GLFeature {
robustness, robustness,
sRGB_framebuffer, sRGB_framebuffer,
sRGB_texture, sRGB_texture,
shader_texture_lod,
sampler_objects, sampler_objects,
standard_derivatives, standard_derivatives,
sync, sync,
@ -410,6 +411,7 @@ public:
ARB_pixel_buffer_object, ARB_pixel_buffer_object,
ARB_robustness, ARB_robustness,
ARB_sampler_objects, ARB_sampler_objects,
ARB_shader_texture_lod,
ARB_sync, ARB_sync,
ARB_texture_compression, ARB_texture_compression,
ARB_texture_float, ARB_texture_float,

View File

@ -538,6 +538,17 @@ static const FeatureInfo sFeatureInfoArr[] = {
GLContext::Extensions_End GLContext::Extensions_End
} }
}, },
{
"shader_texture_lod",
GLVersion::NONE,
GLESVersion::NONE,
GLContext::Extension_None,
{
GLContext::ARB_shader_texture_lod,
GLContext::EXT_shader_texture_lod,
GLContext::Extensions_End
}
},
{ {
"sampler_objects", "sampler_objects",
GLVersion::GL3_3, GLVersion::GL3_3,