Commit 35f59118 by Mohan Maiya Committed by Commit Bot

Bug fix in glTexParameter and glGetTexParameter validation

It is invalid to pass in GL_TEXTURE_BUFFER to either glTexParameter or glGetTexParameter. Return GL_INVALID_ENUM for such usecases. Bug: angleproject:3573 Bug: angleproject:3577 Test: dEQP.KHR_GLES31/core_texture_border_clamp_texparameteri_errors Change-Id: Ia0573c24d38c6be9d1b79a83a05e2ffbc62c8918 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2892023 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 07ae2970
...@@ -6365,7 +6365,8 @@ bool ValidateGetTexParameterBase(const Context *context, ...@@ -6365,7 +6365,8 @@ bool ValidateGetTexParameterBase(const Context *context,
*length = 0; *length = 0;
} }
if (!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target)) if ((!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target)) ||
target == TextureType::Buffer)
{ {
context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget); context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
return false; return false;
...@@ -6914,7 +6915,8 @@ bool ValidateTexParameterBase(const Context *context, ...@@ -6914,7 +6915,8 @@ bool ValidateTexParameterBase(const Context *context,
bool vectorParams, bool vectorParams,
const ParamType *params) const ParamType *params)
{ {
if (!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target)) if ((!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target)) ||
target == TextureType::Buffer)
{ {
context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget); context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
return false; return false;
......
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