projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implementation of GL_EXT_pixel_buffer_object extension.
[mesa.git]
/
src
/
mesa
/
main
/
drawpix.c
diff --git
a/src/mesa/main/drawpix.c
b/src/mesa/main/drawpix.c
index 745d7a304d93f2168b77891838da673f0a9c465e..fc7dd32b06bbb5c780e0c2b1ba6c5666d740e567 100644
(file)
--- a/
src/mesa/main/drawpix.c
+++ b/
src/mesa/main/drawpix.c
@@
-1,6
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 6.
0.
1
+ * Version: 6.1
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@@
-32,6
+32,7
@@
#include "state.h"
#include "mtypes.h"
#include "state.h"
#include "mtypes.h"
+
#if _HAVE_FULL_GL
/*
#if _HAVE_FULL_GL
/*
@@
-58,7
+59,7
@@
_mesa_DrawPixels( GLsizei width, GLsizei height,
if (ctx->RenderMode==GL_RENDER) {
GLint x, y;
if (ctx->RenderMode==GL_RENDER) {
GLint x, y;
- if (!
pixels || !
ctx->Current.RasterPosValid) {
+ if (!ctx->Current.RasterPosValid) {
return;
}
return;
}
@@
-93,6
+94,7
@@
_mesa_DrawPixels( GLsizei width, GLsizei height,
}
}
}
}
+
void GLAPIENTRY
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GLenum type )
void GLAPIENTRY
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GLenum type )
@@
-148,7
+150,7
@@
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
}
}
}
}
-#endif
+#endif
/* _HAVE_FULL_GL */
@@
-165,11
+167,6
@@
_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
return;
}
return;
}
- if (!pixels) {
- _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" );
- return;
- }
-
if (ctx->NewState)
_mesa_update_state(ctx);
if (ctx->NewState)
_mesa_update_state(ctx);
@@
-179,8
+176,6
@@
_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-
-
void GLAPIENTRY
_mesa_Bitmap( GLsizei width, GLsizei height,
GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
void GLAPIENTRY
_mesa_Bitmap( GLsizei width, GLsizei height,
GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
@@
-206,18
+201,16
@@
_mesa_Bitmap( GLsizei width, GLsizei height,
}
if (ctx->RenderMode==GL_RENDER) {
}
if (ctx->RenderMode==GL_RENDER) {
- if (bitmap) {
- /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
- GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
- GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
+ /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
+ GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
+ GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
- if (ctx->NewState) {
- _mesa_update_state(ctx);
- }
-
- ctx->OcclusionResult = GL_TRUE;
- ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+ if (ctx->NewState) {
+ _mesa_update_state(ctx);
}
}
+
+ ctx->OcclusionResult = GL_TRUE;
+ ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
}
#if _HAVE_FULL_GL
else if (ctx->RenderMode==GL_FEEDBACK) {
}
#if _HAVE_FULL_GL
else if (ctx->RenderMode==GL_FEEDBACK) {