Mesa (master): mesa: Don't allow glSamplerParameteriv( GL_TEXTURE_CUBE_MAP_SEAMLESS) in ES
Ian Romanick
idr at kemper.freedesktop.org
Sun Sep 8 14:54:51 UTC 2013
Module: Mesa
Branch: master
Commit: e334ff43c4d6a42b903cc1fbcfd77e34473d336a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e334ff43c4d6a42b903cc1fbcfd77e34473d336a
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Sep 4 10:44:55 2013 -0700
mesa: Don't allow glSamplerParameteriv(GL_TEXTURE_CUBE_MAP_SEAMLESS) in ES
There is no GL_TEXTURE_CUBE_MAP_SEAMLESS in any version of OpenGL ES or
in any extension that applies to OpenGL ES. The same error check
already occurs for glTexParameteri.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Cc: Maxence Le Dore <maxence.ledore at gmail.com>
---
src/mesa/main/samplerobj.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 39cfcd0..c3b612c 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -569,7 +569,8 @@ static GLuint
set_sampler_cube_map_seamless(struct gl_context *ctx,
struct gl_sampler_object *samp, GLboolean param)
{
- if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+ if (!_mesa_is_desktop_gl(ctx)
+ || !ctx->Extensions.AMD_seamless_cubemap_per_texture)
return INVALID_PNAME;
if (samp->CubeMapSeamless == param)
More information about the mesa-commit
mailing list