fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/es: Validate glTexImage border in Mesa code rather than the ES wrapper

Browse source 
Also validate glCopyTexImage border.  This fixes a bug in the APIspec.
Previously glTexImage3DOES could be passed a non-zero border without error.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Ian Romanick 2012-07-26 18:46:23 -07:00
parent 59d965333c
commit 0686ccac95
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/main/APIspec.xml
View file

@ -306,10 +306,6 @@
</desc>
</desc>
<desc name="border" error="GL_INVALID_VALUE">
<value name="0"/>
</desc>
<desc name="format">
<value name="GL_ALPHA"/>
@ -1572,10 +1568,6 @@
<value name="GL_LUMINANCE"/>
<value name="GL_LUMINANCE_ALPHA"/>
</desc>
<desc name="border" error="GL_INVALID_VALUE">
<value name="0"/>
</desc>
</template>
<template name="CopyTexSubImage2D">

6
src/mesa/main/teximage.c
View file

@ -1605,7 +1605,8 @@ texture_error_check( struct gl_context *ctx,
/* Check border */
if (border < 0 || border > 1 ||
((target == GL_TEXTURE_RECTANGLE_NV ||
((ctx->API != API_OPENGL ||
target == GL_TEXTURE_RECTANGLE_NV ||
target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
if (!isProxy) {
_mesa_error(ctx, GL_INVALID_VALUE,
@ -2007,7 +2008,8 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
/* Check border */
if (border < 0 || border > 1 ||
((target == GL_TEXTURE_RECTANGLE_NV ||
((ctx->API != API_OPENGL ||
target == GL_TEXTURE_RECTANGLE_NV ||
target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glCopyTexImage%dD(border=%d)", dimensions, border);