summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-10-19 20:09:47 +0000
committerBrian Paul <[email protected]>2000-10-19 20:09:47 +0000
commita5b66333fb1f6c60332d49be62cf15071a7b633a (patch)
tree7813093ce01e8cf8268c51f46a109b9201b39a30 /src/mesa
parent9f0bb59c53f1413531ca679e7d3516bf8d30cae3 (diff)
glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/pixel.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 8c839b894c4..a0218e10420 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,8 +1,8 @@
-/* $Id: pixel.c,v 1.12 2000/08/21 14:22:24 brianp Exp $ */
+/* $Id: pixel.c,v 1.13 2000/10/19 20:09:47 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -105,6 +105,14 @@ _mesa_PixelStorei( GLenum pname, GLint param )
ctx->Pack.SkipRows = param;
}
break;
+ case GL_PACK_SKIP_IMAGES:
+ if (param<0) {
+ gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+ }
+ else {
+ ctx->Pack.SkipImages = param;
+ }
+ break;
case GL_PACK_ALIGNMENT:
if (param==1 || param==2 || param==4 || param==8) {
ctx->Pack.Alignment = param;
@@ -149,6 +157,14 @@ _mesa_PixelStorei( GLenum pname, GLint param )
ctx->Unpack.SkipRows = param;
}
break;
+ case GL_UNPACK_SKIP_IMAGES:
+ if (param < 0) {
+ gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+ }
+ else {
+ ctx->Unpack.SkipImages = param;
+ }
+ break;
case GL_UNPACK_ALIGNMENT:
if (param==1 || param==2 || param==4 || param==8) {
ctx->Unpack.Alignment = param;