projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: minor error string changes
[mesa.git]
/
src
/
mesa
/
main
/
colortab.c
diff --git
a/src/mesa/main/colortab.c
b/src/mesa/main/colortab.c
index bd9cf438b4f5f9ed223462da5267a1187cadaff0..36304065eb7c0aa9cd86b6e499e89f701674006b 100644
(file)
--- a/
src/mesa/main/colortab.c
+++ b/
src/mesa/main/colortab.c
@@
-179,7
+179,7
@@
store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
GLfloat bScale, GLfloat bBias,
GLfloat aScale, GLfloat aBias)
{
GLfloat bScale, GLfloat bBias,
GLfloat aScale, GLfloat aBias)
{
- if (
ctx->Unpack.BufferObj->Name
) {
+ if (
_mesa_is_bufferobj(ctx->Unpack.BufferObj)
) {
/* Get/unpack the color table data from a PBO */
GLubyte *buf;
if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
/* Get/unpack the color table data from a PBO */
GLubyte *buf;
if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
@@
-279,7
+279,7
@@
store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
}
}
}
}
- if (
ctx->Unpack.BufferObj->Name
) {
+ if (
_mesa_is_bufferobj(ctx->Unpack.BufferObj)
) {
ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
ctx->Unpack.BufferObj);
}
ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
ctx->Unpack.BufferObj);
}
@@
-696,7
+696,7
@@
_mesa_GetColorTable( GLenum target, GLenum format,
return;
}
return;
}
- if (
ctx->Pack.BufferObj->Name
) {
+ if (
_mesa_is_bufferobj(ctx->Pack.BufferObj)
) {
/* pack color table into PBO */
GLubyte *buf;
if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
/* pack color table into PBO */
GLubyte *buf;
if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
@@
-720,7
+720,7
@@
_mesa_GetColorTable( GLenum target, GLenum format,
_mesa_pack_rgba_span_float(ctx, table->Size, rgba,
format, type, data, &ctx->Pack, 0x0);
_mesa_pack_rgba_span_float(ctx, table->Size, rgba,
format, type, data, &ctx->Pack, 0x0);
- if (
ctx->Pack.BufferObj->Name
) {
+ if (
_mesa_is_bufferobj(ctx->Pack.BufferObj)
) {
ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
ctx->Pack.BufferObj);
}
ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
ctx->Pack.BufferObj);
}