Commit 91ab54b6 by Geoff Lang Committed by Commit Bot

Make ANGLE_texture_usage enableable.

BUG=angleproject:1523 Change-Id: I4e6e4ec6ae7cfb616869373b62dc455d0c5c8c09 Reviewed-on: https://chromium-review.googlesource.com/744444 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 8724e254
...@@ -657,7 +657,7 @@ const ExtensionInfoMap &GetExtensionInfoMap() ...@@ -657,7 +657,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
map["GL_EXT_shader_texture_lod"] = enableableExtension(&Extensions::shaderTextureLOD); map["GL_EXT_shader_texture_lod"] = enableableExtension(&Extensions::shaderTextureLOD);
map["GL_EXT_frag_depth"] = enableableExtension(&Extensions::fragDepth); map["GL_EXT_frag_depth"] = enableableExtension(&Extensions::fragDepth);
map["GL_ANGLE_multiview"] = enableableExtension(&Extensions::multiview); map["GL_ANGLE_multiview"] = enableableExtension(&Extensions::multiview);
map["GL_ANGLE_texture_usage"] = esOnlyExtension(&Extensions::textureUsage); map["GL_ANGLE_texture_usage"] = enableableExtension(&Extensions::textureUsage);
map["GL_ANGLE_translated_shader_source"] = esOnlyExtension(&Extensions::translatedShaderSource); map["GL_ANGLE_translated_shader_source"] = esOnlyExtension(&Extensions::translatedShaderSource);
map["GL_OES_fbo_render_mipmap"] = enableableExtension(&Extensions::fboRenderMipmap); map["GL_OES_fbo_render_mipmap"] = enableableExtension(&Extensions::fboRenderMipmap);
map["GL_EXT_discard_framebuffer"] = esOnlyExtension(&Extensions::discardFramebuffer); map["GL_EXT_discard_framebuffer"] = esOnlyExtension(&Extensions::discardFramebuffer);
......
...@@ -73,6 +73,7 @@ ContextNULL::ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *a ...@@ -73,6 +73,7 @@ ContextNULL::ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *a
mExtensions.copyTexture = true; mExtensions.copyTexture = true;
mExtensions.copyCompressedTexture = true; mExtensions.copyCompressedTexture = true;
mExtensions.textureRectangle = true; mExtensions.textureRectangle = true;
mExtensions.textureUsage = true;
mExtensions.rgb8rgba8 = true; mExtensions.rgb8rgba8 = true;
......
...@@ -5403,6 +5403,12 @@ bool ValidateTexParameterBase(Context *context, ...@@ -5403,6 +5403,12 @@ bool ValidateTexParameterBase(Context *context,
break; break;
case GL_TEXTURE_USAGE_ANGLE: case GL_TEXTURE_USAGE_ANGLE:
if (!context->getExtensions().textureUsage)
{
ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
return false;
}
switch (ConvertToGLenum(params[0])) switch (ConvertToGLenum(params[0]))
{ {
case GL_NONE: case GL_NONE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment