diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-16 17:17:43 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-07-30 16:10:11 -0700 |
| commit | d8074a6a1ca5fa5249813d0585b356ba869a9156 (patch) | |
| tree | 80d6c8c2a8e1ed9236816d07a59e6a9222394d57 | |
| parent | 816d37e5c59b50167e0b13c5e290a08f04ee166c (diff) | |
mesa: Don't allow GL_TEXTURE_BORDER queries outside compat profile
There are no texture borders in any version of OpenGL ES or desktop
OpenGL core profile.
Fixes piglit's gl-3.2-texture-border-deprecated.
v2: Rebase on different initial change.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Cc: "10.2 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 750286600b871ee5506e2589719f58bda215a605)
| -rw-r--r-- | src/mesa/main/texparam.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index dc17ea58475..0f986e48595 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -1107,6 +1107,8 @@ get_tex_level_parameter_image(struct gl_context *ctx, } break; case GL_TEXTURE_BORDER: + if (ctx->API != API_OPENGL_COMPAT) + goto invalid_pname; *params = img->Border; break; case GL_TEXTURE_RED_SIZE: |