OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5b8ede
)
st/mesa: use MAX3() macro, as we do for sampler view code below
author
Brian Paul
<brianp@vmware.com>
Tue, 9 Feb 2016 21:20:41 +0000
(14:20 -0700)
committer
Brian Paul
<brianp@vmware.com>
Wed, 10 Feb 2016 00:48:25 +0000
(17:48 -0700)
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
src/mesa/state_tracker/st_cb_drawpixels.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index
9c1eba4
..
7096bd2
100644
(file)
--- a/
src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/
src/mesa/state_tracker/st_cb_drawpixels.c
@@
-650,7
+650,8
@@
draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
if (fpv) {
/* drawing a color image */
const struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
- uint num = MAX2(MAX2(fpv->drawpix_sampler, fpv->pixelmap_sampler) + 1,
+ uint num = MAX3(fpv->drawpix_sampler + 1,
+ fpv->pixelmap_sampler + 1,
st->state.num_samplers[PIPE_SHADER_FRAGMENT]);
uint i;