projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600g: Move fetch shader register setup to r600_state.c / evergreen_state.c.
[mesa.git]
/
src
/
gallium
/
drivers
/
cell
/
common.h
diff --git
a/src/gallium/drivers/cell/common.h
b/src/gallium/drivers/cell/common.h
index d5f5c7bbba81544c692720738e84119555a80730..a8cdde34aa7717b6738c746511d897909c949455 100644
(file)
--- a/
src/gallium/drivers/cell/common.h
+++ b/
src/gallium/drivers/cell/common.h
@@
-36,7
+36,7
@@
#include "pipe/p_compiler.h"
#include "pipe/p_format.h"
#include "pipe/p_state.h"
#include "pipe/p_compiler.h"
#include "pipe/p_format.h"
#include "pipe/p_state.h"
-
+#include <stdio.h>
/** The standard assert macro doesn't seem to work reliably */
#define ASSERT(x) \
/** The standard assert macro doesn't seem to work reliably */
#define ASSERT(x) \
@@
-49,7
+49,6
@@
}
}
-
#define JOIN(x, y) JOIN_AGAIN(x, y)
#define JOIN_AGAIN(x, y) x ## y
#define JOIN(x, y) JOIN_AGAIN(x, y)
#define JOIN_AGAIN(x, y) x ## y
@@
-231,6
+230,7
@@
struct cell_command_rasterizer
{
opcode_t opcode; /**< CELL_CMD_STATE_RASTERIZER */
struct pipe_rasterizer_state rasterizer;
{
opcode_t opcode; /**< CELL_CMD_STATE_RASTERIZER */
struct pipe_rasterizer_state rasterizer;
+ /*uint32_t pad[1];*/
};
};
@@
-327,7
+327,7
@@
struct cell_command_sampler
opcode_t opcode; /**< CELL_CMD_STATE_SAMPLER */
uint unit;
struct pipe_sampler_state state;
opcode_t opcode; /**< CELL_CMD_STATE_SAMPLER */
uint unit;
struct pipe_sampler_state state;
- uint32_t pad_[
2
];
+ uint32_t pad_[
3
];
};
};
@@
-358,6
+358,7
@@
struct cell_spu_function_info
/** This is the object passed to spe_create_thread() */
/** This is the object passed to spe_create_thread() */
+PIPE_ALIGN_TYPE(16,
struct cell_init_info
{
unsigned id;
struct cell_init_info
{
unsigned id;
@@
-370,7
+371,7
@@
struct cell_init_info
uint *buffer_status; /**< points at cell_context->buffer_status */
struct cell_spu_function_info *spu_functions;
uint *buffer_status; /**< points at cell_context->buffer_status */
struct cell_spu_function_info *spu_functions;
-}
ALIGN16_ATTRIB
;
+}
)
;
#endif /* CELL_COMMON_H */
#endif /* CELL_COMMON_H */