diff options
author | Eric Anholt <eric@anholt.net> | 2011-10-18 11:52:39 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2011-10-20 08:45:07 -0700 |
commit | f80e1e7d1de80fd919f376368d1cfc9416dabdc3 (patch) | |
tree | e3c6e379fb93b6eb1920570c86c03bc7e78965db /src/mesa/main | |
parent | 46d5fb576a37bdd50cd4a2795b27852b4c8a8250 (diff) | |
download | external_mesa3d-f80e1e7d1de80fd919f376368d1cfc9416dabdc3.zip external_mesa3d-f80e1e7d1de80fd919f376368d1cfc9416dabdc3.tar.gz external_mesa3d-f80e1e7d1de80fd919f376368d1cfc9416dabdc3.tar.bz2 |
mesa: Round the argument to PixelStoref instead of truncating.
From the GL 2.1 specification, page 114 (page 128 of the PDF):
"The version of PixelStore that takes a floating-point value
may be used to set any type of parameter; if the parameter is
boolean, then it is set to FALSE if the passed value is 0.0
and TRUE otherwise, while if the parameter is an integer, then
the passed value is rounded to the nearest integer."
Fixes piglit roundmode-pixelstore.
Note: This is a candidate for the 7.11 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/fbobject.c | 8 | ||||
-rw-r--r-- | src/mesa/main/pixelstore.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index f9da54e..c56062a 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -2486,6 +2486,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, void GLAPIENTRY _mesa_GenerateMipmapEXT(GLenum target) { + struct gl_texture_image *srcImage; struct gl_texture_object *texObj; GLboolean error; @@ -2532,6 +2533,13 @@ _mesa_GenerateMipmapEXT(GLenum target) } _mesa_lock_texture(ctx, texObj); + + srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel); + if (!srcImage) { + _mesa_unlock_texture(ctx, texObj); + return; + } + if (target == GL_TEXTURE_CUBE_MAP) { GLuint face; for (face = 0; face < 6; face++) diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c index d957950..8147449 100644 --- a/src/mesa/main/pixelstore.c +++ b/src/mesa/main/pixelstore.c @@ -214,7 +214,7 @@ _mesa_PixelStorei( GLenum pname, GLint param ) void GLAPIENTRY _mesa_PixelStoref( GLenum pname, GLfloat param ) { - _mesa_PixelStorei( pname, (GLint) param ); + _mesa_PixelStorei( pname, IROUND(param) ); } |