projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
draw: added array element debug / bounds checking code (disabled)
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_vs_aos_machine.c
diff --git
a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
index e029b7b4bb5e9905aadc53faeaeb123d393da059..0eda414ee6ae27f6beb4b9e0e0773afd1fcdacb0 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_vs_aos_machine.c
+++ b/
src/gallium/auxiliary/draw/draw_vs_aos_machine.c
@@
-29,8
+29,9
@@
#include "pipe/p_config.h"
#include "pipe/p_config.h"
-#include "pipe/p_util.h"
#include "pipe/p_shader_tokens.h"
#include "pipe/p_shader_tokens.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_util.h"
#include "tgsi/tgsi_exec.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_util.h"
#include "tgsi/tgsi_exec.h"
@@
-73,7
+74,7
@@
void PIPE_CDECL aos_do_lit( struct aos_machine *machine,
{
result[0] = 1.0F;
result[1] = in[0];
{
result[0] = 1.0F;
result[1] = in[0];
- result[2] =
1.0
;
+ result[2] =
0.0F
;
result[3] = 1.0F;
}
else
result[3] = 1.0F;
}
else
@@
-107,7
+108,7
@@
static void PIPE_CDECL do_lit_lut( struct aos_machine *machine,
{
result[0] = 1.0F;
result[1] = in[0];
{
result[0] = 1.0F;
result[1] = in[0];
- result[2] =
1.0
;
+ result[2] =
0.0F
;
result[3] = 1.0F;
return;
}
result[3] = 1.0F;
return;
}
@@
-218,10
+219,12
@@
static void PIPE_CDECL populate_lut( struct aos_machine *machine,
}
}
-void draw_vs_aos_machine_constants( struct aos_machine *machine,
- const float (*constants)[4] )
+void
+draw_vs_aos_machine_constants(struct aos_machine *machine,
+ unsigned slot,
+ const void *constants)
{
{
- machine->constants = constants;
+ machine->constants
[slot]
= constants;
{
unsigned i;
{
unsigned i;
@@
-306,8
+309,10
@@
void draw_vs_aos_machine_viewport( struct aos_machine *machine,
{
}
{
}
-void draw_vs_aos_machine_constants( struct aos_machine *machine,
- const float (*constants)[4] )
+void
+draw_vs_aos_machine_constants(struct aos_machine *machine,
+ unsigned slot,
+ const void *constants)
{
}
{
}