projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glthread: rename marshal.h/c to glthread_marshal.h and glthread_shaderobj.c
[mesa.git]
/
src
/
mesa
/
main
/
drawpix.c
diff --git
a/src/mesa/main/drawpix.c
b/src/mesa/main/drawpix.c
index 55035f214b3d050978d56fce237408dcc4e21480..2f55dde7b8092fa37525288dcb7c52c5e0c7f1d6 100644
(file)
--- a/
src/mesa/main/drawpix.c
+++ b/
src/mesa/main/drawpix.c
@@
-24,6
+24,7
@@
#include "glheader.h"
#include "imports.h"
#include "glheader.h"
#include "imports.h"
+#include "draw_validate.h"
#include "bufferobj.h"
#include "context.h"
#include "drawpix.h"
#include "bufferobj.h"
#include "context.h"
#include "drawpix.h"
@@
-33,7
+34,6
@@
#include "image.h"
#include "pbo.h"
#include "state.h"
#include "image.h"
#include "pbo.h"
#include "state.h"
-#include "dispatch.h"
#include "glformats.h"
#include "fbobject.h"
#include "glformats.h"
#include "fbobject.h"
@@
-53,10
+53,10
@@
_mesa_DrawPixels( GLsizei width, GLsizei height,
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDrawPixels(%d, %d, %s, %s, %p) // to %s at %d, %d\n",
width, height,
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDrawPixels(%d, %d, %s, %s, %p) // to %s at %d, %d\n",
width, height,
- _mesa_
lookup_enum_by_nr
(format),
- _mesa_
lookup_enum_by_nr
(type),
+ _mesa_
enum_to_string
(format),
+ _mesa_
enum_to_string
(type),
pixels,
pixels,
- _mesa_
lookup_enum_by_nr
(ctx->DrawBuffer->ColorDrawBuffer[0]),
+ _mesa_
enum_to_string
(ctx->DrawBuffer->ColorDrawBuffer[0]),
IROUND(ctx->Current.RasterPos[0]),
IROUND(ctx->Current.RasterPos[1]));
IROUND(ctx->Current.RasterPos[0]),
IROUND(ctx->Current.RasterPos[1]));
@@
-96,8
+96,8
@@
_mesa_DrawPixels( GLsizei width, GLsizei height,
err = _mesa_error_check_format_and_type(ctx, format, type);
if (err != GL_NO_ERROR) {
_mesa_error(ctx, err, "glDrawPixels(invalid format %s and/or type %s)",
err = _mesa_error_check_format_and_type(ctx, format, type);
if (err != GL_NO_ERROR) {
_mesa_error(ctx, err, "glDrawPixels(invalid format %s and/or type %s)",
- _mesa_
lookup_enum_by_nr
(format),
- _mesa_
lookup_enum_by_nr
(type));
+ _mesa_
enum_to_string
(format),
+ _mesa_
enum_to_string
(type));
goto end;
}
goto end;
}
@@
-198,9
+198,9
@@
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
_mesa_debug(ctx,
"glCopyPixels(%d, %d, %d, %d, %s) // from %s to %s at %d, %d\n",
srcx, srcy, width, height,
_mesa_debug(ctx,
"glCopyPixels(%d, %d, %d, %d, %s) // from %s to %s at %d, %d\n",
srcx, srcy, width, height,
- _mesa_
lookup_enum_by_nr
(type),
- _mesa_
lookup_enum_by_nr
(ctx->ReadBuffer->ColorReadBuffer),
- _mesa_
lookup_enum_by_nr
(ctx->DrawBuffer->ColorDrawBuffer[0]),
+ _mesa_
enum_to_string
(type),
+ _mesa_
enum_to_string
(ctx->ReadBuffer->ColorReadBuffer),
+ _mesa_
enum_to_string
(ctx->DrawBuffer->ColorDrawBuffer[0]),
IROUND(ctx->Current.RasterPos[0]),
IROUND(ctx->Current.RasterPos[1]));
IROUND(ctx->Current.RasterPos[0]),
IROUND(ctx->Current.RasterPos[1]));
@@
-218,7
+218,7
@@
_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
type != GL_STENCIL &&
type != GL_DEPTH_STENCIL) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
type != GL_STENCIL &&
type != GL_DEPTH_STENCIL) {
_mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
- _mesa_
lookup_enum_by_nr
(type));
+ _mesa_
enum_to_string
(type));
return;
}
return;
}