projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svga: use shader sampler view declarations
[mesa.git]
/
src
/
gallium
/
drivers
/
nouveau
/
nouveau_compiler.c
diff --git
a/src/gallium/drivers/nouveau/nouveau_compiler.c
b/src/gallium/drivers/nouveau/nouveau_compiler.c
index 495450b317a92369964b7122e5f41403a6f09a7d..ca73fd17a43d221a4676d1d25a20a11295e9414f 100644
(file)
--- a/
src/gallium/drivers/nouveau/nouveau_compiler.c
+++ b/
src/gallium/drivers/nouveau/nouveau_compiler.c
@@
-112,10
+112,8
@@
nouveau_codegen(int chipset, int type, struct tgsi_token tokens[],
info.bin.sourceRep = NV50_PROGRAM_IR_TGSI;
info.bin.source = tokens;
info.bin.sourceRep = NV50_PROGRAM_IR_TGSI;
info.bin.source = tokens;
- info.io.
ucp
CBSlot = 15;
+ info.io.
aux
CBSlot = 15;
info.io.ucpBase = NV50_CB_AUX_UCP_OFFSET;
info.io.ucpBase = NV50_CB_AUX_UCP_OFFSET;
-
- info.io.resInfoCBSlot = 15;
info.io.suInfoBase = NV50_CB_AUX_TEX_MS_OFFSET;
info.io.msInfoCBSlot = 15;
info.io.msInfoBase = NV50_CB_AUX_MS_OFFSET;
info.io.suInfoBase = NV50_CB_AUX_TEX_MS_OFFSET;
info.io.msInfoCBSlot = 15;
info.io.msInfoBase = NV50_CB_AUX_MS_OFFSET;
@@
-168,7
+166,7
@@
main(int argc, char *argv[])
else
f = fopen(filename, "r");
else
f = fopen(filename, "r");
- if (
f == NULL
) {
+ if (
!f
) {
_debug_printf("Error opening file '%s': %s\n", filename, strerror(errno));
return 1;
}
_debug_printf("Error opening file '%s': %s\n", filename, strerror(errno));
return 1;
}