Mesa (7.11): st/mesa: Use correct internal target
Brian Paul
brianp at kemper.freedesktop.org
Wed Jun 29 13:22:59 UTC 2011
Module: Mesa
Branch: 7.11
Commit: 82ebfa63876c82d7b860ee9ac76c7072d4741f31
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82ebfa63876c82d7b860ee9ac76c7072d4741f31
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Jun 28 18:47:41 2011 +0100
st/mesa: Use correct internal target
Commit 1a339b6c(st/mesa: prefer native texture formats when possible)
introduced two new arguments to the st_choose_format() functions.
This patch fixes the order and passes the correct internal_target
rather than GL_NONE
NOTE: This is a candidate for the 7.11 branch
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 9b5c538726d279c79c1c74047fe19a6caab5321e)
---
src/mesa/state_tracker/st_cb_drawpixels.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index c730975..d61d7ac 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1400,14 +1400,14 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
/* srcFormat can't be used as a texture format */
if (type == GL_DEPTH) {
texFormat = st_choose_format(screen, GL_DEPTH_COMPONENT,
- st->internal_target, GL_NONE, GL_NONE,
+ GL_NONE, GL_NONE, st->internal_target,
sample_count, PIPE_BIND_DEPTH_STENCIL);
assert(texFormat != PIPE_FORMAT_NONE);
}
else {
/* default color format */
texFormat = st_choose_format(screen, GL_RGBA,
- st->internal_target, GL_NONE, GL_NONE,
+ GL_NONE, GL_NONE, st->internal_target,
sample_count, PIPE_BIND_SAMPLER_VIEW);
assert(texFormat != PIPE_FORMAT_NONE);
}
More information about the mesa-commit
mailing list