projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assorted changes for supporting GLfloat color channels (not done)
[mesa.git]
/
src
/
mesa
/
main
/
teximage.c
diff --git
a/src/mesa/main/teximage.c
b/src/mesa/main/teximage.c
index eae4077c4efb09a95089f387cbeab4c72d537b40..ffddeffbabc79da27eb186557ab4a49772b6a0f2 100644
(file)
--- a/
src/mesa/main/teximage.c
+++ b/
src/mesa/main/teximage.c
@@
-1,4
+1,4
@@
-/* $Id: teximage.c,v 1.
98 2001/06/15 14:18:46
brianp Exp $ */
+/* $Id: teximage.c,v 1.
100 2001/07/13 20:07:37
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-58,6
+58,9
@@
#ifdef DEBUG
static void PrintTexture(const struct gl_texture_image *img)
{
#ifdef DEBUG
static void PrintTexture(const struct gl_texture_image *img)
{
+#if CHAN_TYPE == GL_FLOAT
+ _mesa_problem(NULL, "PrintTexture doesn't support float channels");
+#else
GLuint i, j, c;
const GLchan *data = (const GLchan *) img->Data;
GLuint i, j, c;
const GLchan *data = (const GLchan *) img->Data;
@@
-101,6
+104,7
@@
static void PrintTexture(const struct gl_texture_image *img)
}
printf("\n");
}
}
printf("\n");
}
+#endif
}
#endif
}
#endif
@@
-1349,7
+1353,7
@@
_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
_mesa_init_teximage_fields(ctx, texImage, postConvWidth, 1, 1,
border, internalFormat);
_mesa_init_teximage_fields(ctx, texImage, postConvWidth, 1, 1,
border, internalFormat);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage1D);
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage1D);
@@
-1466,7
+1470,7
@@
_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
_mesa_init_teximage_fields(ctx, texImage, postConvWidth, postConvHeight,
1, border, internalFormat);
_mesa_init_teximage_fields(ctx, texImage, postConvWidth, postConvHeight,
1, border, internalFormat);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage2D);
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage2D);
@@
-1577,7
+1581,7
@@
_mesa_TexImage3D( GLenum target, GLint level, GLenum internalFormat,
_mesa_init_teximage_fields(ctx, texImage, width, height, depth, border,
internalFormat);
_mesa_init_teximage_fields(ctx, texImage, width, height, depth, border,
internalFormat);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage3D);
_mesa_update_state(ctx);
ASSERT(ctx->Driver.TexImage3D);
@@
-1669,7
+1673,7
@@
_mesa_TexSubImage1D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
/* XXX should test internal format */
_mesa_update_state(ctx);
/* XXX should test internal format */
@@
-1715,7
+1719,7
@@
_mesa_TexSubImage2D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
/* XXX should test internal format */
_mesa_update_state(ctx);
/* XXX should test internal format */
@@
-1763,7
+1767,7
@@
_mesa_TexSubImage3D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
_mesa_update_state(ctx);
if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
@@
-1808,7
+1812,7
@@
_mesa_CopyTexImage1D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
if (is_color_format(internalFormat)) {
_mesa_update_state(ctx);
if (is_color_format(internalFormat)) {
@@
-1871,7
+1875,7
@@
_mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
if (is_color_format(internalFormat)) {
_mesa_update_state(ctx);
if (is_color_format(internalFormat)) {
@@
-1933,7
+1937,7
@@
_mesa_CopyTexSubImage1D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
/* XXX should test internal format */
_mesa_update_state(ctx);
/* XXX should test internal format */
@@
-1969,7
+1973,7
@@
_mesa_CopyTexSubImage2D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
/* XXX should test internal format */
_mesa_update_state(ctx);
/* XXX should test internal format */
@@
-2007,7
+2011,7
@@
_mesa_CopyTexSubImage3D( GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->NewState & _
NEW_PIXEL
)
+ if (ctx->NewState & _
IMAGE_NEW_TRANSFER_STATE
)
_mesa_update_state(ctx);
/* XXX should test internal format */
_mesa_update_state(ctx);
/* XXX should test internal format */