summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-08-10 11:43:04 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-08-10 12:14:25 -0600
commit519aacef031e3271e16693308ca462346a8a160c (patch)
tree0a0992015ab57661b12bee0b725c189b773cd8a6
parent80e8538a5d7f99b59f4577defdb7023e39dc5f69 (diff)
fix asst glitches
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 20990fe80a6..f0c7a2bfc5a 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -81,7 +81,7 @@ make_drawpixels_shader(struct st_context *st)
/* END; */
p->Instructions[1].Opcode = OPCODE_END;
- p->InputsRead = FRAG_BIT_COL0;
+ p->InputsRead = FRAG_BIT_TEX0;
p->OutputsWritten = (1 << FRAG_RESULT_COLR);
stfp = (struct st_fragment_program *) p;
@@ -100,7 +100,7 @@ make_mipmap_tree(struct st_context *st,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels)
{
- GLuint pipeFormat = st_choose_pipe_format(st->pipe, format, type, GL_RGBA);
+ GLuint pipeFormat = st_choose_pipe_format(st->pipe, GL_RGBA, format, type);
int cpp = 4, pitch;
struct pipe_mipmap_tree *mt = CALLOC_STRUCT(pipe_mipmap_tree);
@@ -249,7 +249,7 @@ static GLboolean
compatible_formats(GLenum format, GLenum type, GLuint pipeFormat)
{
static const GLuint one = 1;
- GLubyte littleEndian = *((GLubyte *) one);
+ GLubyte littleEndian = *((GLubyte *) &one);
if (pipeFormat == PIPE_FORMAT_U_R8_G8_B8_A8 &&
format == GL_RGBA &&