projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
draw: Include missing headers in draw_vs_aos.h.
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_vs_aos.h
diff --git
a/src/gallium/auxiliary/draw/draw_vs_aos.h
b/src/gallium/auxiliary/draw/draw_vs_aos.h
index 7fe6f79db0da2f0c8e765cc46345700410241d57..68e8295b5e117e063d8aad9007350d2c3ae75b40 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_vs_aos.h
+++ b/
src/gallium/auxiliary/draw/draw_vs_aos.h
@@
-32,6
+32,8
@@
#define DRAW_VS_AOS_H
#include "pipe/p_config.h"
#define DRAW_VS_AOS_H
#include "pipe/p_config.h"
+#include "tgsi/tgsi_exec.h"
+#include "draw_vs.h"
#ifdef PIPE_ARCH_X86
#ifdef PIPE_ARCH_X86
@@
-87,9
+89,10
@@
struct lit_info {
#define MAX_SHINE_TAB 4
#define MAX_LIT_INFO 16
#define MAX_SHINE_TAB 4
#define MAX_LIT_INFO 16
-struct aos_attrib {
- const void *input_ptr;
- unsigned input_stride;
+struct aos_buffer {
+ const void *base_ptr;
+ unsigned stride;
+ void *ptr; /* updated per vertex */
};
};
@@
-121,9
+124,9
@@
struct aos_machine {
ushort fpucntl; /* one of FPU_* above */
const float (*immediates)[4]; /* points to shader data */
ushort fpucntl; /* one of FPU_* above */
const float (*immediates)[4]; /* points to shader data */
- const
float (*constants)[4];
/* points to draw data */
+ const
void *constants[PIPE_MAX_CONSTANT_BUFFERS];
/* points to draw data */
- const struct aos_
attrib *attrib
; /* points to ? */
+ const struct aos_
buffer *buffer
; /* points to ? */
};
};
@@
-175,12
+178,15
@@
void aos_adopt_xmm_reg( struct aos_compilation *cp,
unsigned idx,
unsigned dirty );
unsigned idx,
unsigned dirty );
+void aos_spill_all( struct aos_compilation *cp );
+
struct x86_reg aos_get_shader_reg( struct aos_compilation *cp,
unsigned file,
unsigned idx );
struct x86_reg aos_get_shader_reg( struct aos_compilation *cp,
unsigned file,
unsigned idx );
-boolean aos_fetch_inputs( struct aos_compilation *cp,
- boolean linear );
+boolean aos_init_inputs( struct aos_compilation *cp, boolean linear );
+boolean aos_fetch_inputs( struct aos_compilation *cp, boolean linear );
+boolean aos_incr_inputs( struct aos_compilation *cp, boolean linear );
boolean aos_emit_outputs( struct aos_compilation *cp );
boolean aos_emit_outputs( struct aos_compilation *cp );
@@
-200,7
+206,7
@@
struct x86_reg aos_get_internal_xmm( struct aos_compilation *cp,
unsigned imm );
unsigned imm );
-#define ERROR(cp, msg) \
+#define
AOS_
ERROR(cp, msg) \
do { \
if (0) debug_printf("%s: x86 translation failed: %s\n", __FUNCTION__, msg); \
cp->error = 1; \
do { \
if (0) debug_printf("%s: x86 translation failed: %s\n", __FUNCTION__, msg); \
cp->error = 1; \
@@
-210,7
+216,7
@@
do { \
#define X86_NULL 0
#define X86_IMMEDIATES 1
#define X86_CONSTANTS 2
#define X86_NULL 0
#define X86_IMMEDIATES 1
#define X86_CONSTANTS 2
-#define X86_
ATTRIB
S 3
+#define X86_
BUFFER
S 3
struct x86_reg aos_get_x86( struct aos_compilation *cp,
unsigned which_reg,
struct x86_reg aos_get_x86( struct aos_compilation *cp,
unsigned which_reg,
@@
-232,7
+238,8
@@
struct draw_vs_varient_aos_sse {
struct draw_vs_varient base;
struct draw_context *draw;
struct draw_vs_varient base;
struct draw_context *draw;
- struct aos_attrib *attrib;
+ struct aos_buffer *buffer;
+ unsigned nr_vb;
vaos_run_linear_func gen_run_linear;
vaos_run_elts_func gen_run_elts;
vaos_run_linear_func gen_run_linear;
vaos_run_elts_func gen_run_elts;