summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_texprog.c
diff options
context:
space:
mode:
authorBen Skeggs <darktama@iinet.net.au>2005-05-23 14:14:19 +0000
committerBen Skeggs <darktama@iinet.net.au>2005-05-23 14:14:19 +0000
commiteeada484979e9784ebb03f635f207e717a04e311 (patch)
tree54a94ddb1af18e91f5908e035b2e2242ca1d0bc5 /src/mesa/drivers/dri/r300/r300_texprog.c
parent0c4731b27ccf5faa1393102107862c28642b3d76 (diff)
Implement enough of ARB_fragment_program for Keith's texenv program
generation in Mesa. Requires most recent Mesa cvs to work correctly. Swizzle code is possibly slow/buggy and will probably be replaced. Old behaviour can be controlled by a #define in r300_context.h, if no-one minds I'll remove the old code later on. Also, disabled cube map extension. AFAIK We don't support it yet, and it causes issues with UT2004.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texprog.c')
-rw-r--r--src/mesa/drivers/dri/r300/r300_texprog.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texprog.c b/src/mesa/drivers/dri/r300/r300_texprog.c
index eab8dbe7ff..71d28db052 100644
--- a/src/mesa/drivers/dri/r300/r300_texprog.c
+++ b/src/mesa/drivers/dri/r300/r300_texprog.c
@@ -17,6 +17,7 @@
#include "radeon_ioctl.h"
#include "radeon_state.h"
#include "r300_context.h"
+#if USE_ARB_F_P == 0
#include "r300_ioctl.h"
#include "r300_state.h"
#include "r300_reg.h"
@@ -265,4 +266,5 @@ void r300GenerateTextureFragmentShader(r300ContextPtr r300)
p->alu_end = ps->program.alu.length - 1;
p->alu_offset = 0;
}
+#endif // USE_ARB_F_P == 0