diff options
| author | Emil Velikov <[email protected]> | 2011-06-28 18:47:41 +0100 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-06-29 07:18:32 -0600 |
| commit | 9b5c538726d279c79c1c74047fe19a6caab5321e (patch) | |
| tree | 5b9223f7d3b84276a3aaf7b1bca9fb4f057376ab | |
| parent | 5d2fad5444ebe0e2a66c49bd6254e2bc81618f6e (diff) | |
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 <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
| -rw-r--r-- | 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 c730975dfbf..d61d7ac22be 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); } |