projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7b5a84
)
gallium/util: declare sampler view in util_make_fs_blit_msaa_depthstencil()
author
Brian Paul
<brianp@vmware.com>
Fri, 18 Mar 2016 20:20:27 +0000
(14:20 -0600)
committer
Brian Paul
<brianp@vmware.com>
Mon, 21 Mar 2016 17:59:25 +0000
(11:59 -0600)
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
src/gallium/auxiliary/util/u_simple_shaders.c
patch
|
blob
|
history
diff --git
a/src/gallium/auxiliary/util/u_simple_shaders.c
b/src/gallium/auxiliary/util/u_simple_shaders.c
index 7ffb2712472760c55f4fe1d06b21170173a29e06..76950a1a9cf12ee6b272494f58cc93737bfbc110 100644
(file)
--- a/
src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/
src/gallium/auxiliary/util/u_simple_shaders.c
@@
-646,6
+646,7
@@
util_make_fs_blit_msaa_depthstencil(struct pipe_context *pipe,
"FRAG\n"
"DCL IN[0], GENERIC[0], LINEAR\n"
"DCL SAMP[0..1]\n"
+ "DCL SVIEW[0..1], %s, FLOAT\n"
"DCL OUT[0], POSITION\n"
"DCL OUT[1], STENCIL\n"
"DCL TEMP[0]\n"
@@
-663,7
+664,7
@@
util_make_fs_blit_msaa_depthstencil(struct pipe_context *pipe,
assert(tgsi_tex == TGSI_TEXTURE_2D_MSAA ||
tgsi_tex == TGSI_TEXTURE_2D_ARRAY_MSAA);
- sprintf(text, shader_templ, type, type);
+ sprintf(text, shader_templ, type, type
, type
);
if (!tgsi_text_translate(text, tokens, Elements(tokens))) {
assert(0);