projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300/compiler: kill off RC_WRAP_CLAMP
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_context.h
diff --git
a/src/gallium/drivers/r300/r300_context.h
b/src/gallium/drivers/r300/r300_context.h
index 6ab10c874ddddf987e31c979afd5886d13473fcf..2e8601b65efccff019de9d87f5dc09bfa26beb03 100644
(file)
--- a/
src/gallium/drivers/r300/r300_context.h
+++ b/
src/gallium/drivers/r300/r300_context.h
@@
-53,8
+53,6
@@
struct r300_atom {
unsigned size;
/* Whether this atom should be emitted. */
boolean dirty;
unsigned size;
/* Whether this atom should be emitted. */
boolean dirty;
- /* Another dirty flag that is never automatically cleared. */
- boolean always_dirty;
};
struct r300_blend_state {
};
struct r300_blend_state {
@@
-362,8
+360,6
@@
struct r300_context {
struct r300_atom blend_color_state;
/* User clip planes. */
struct r300_atom clip_state;
struct r300_atom blend_color_state;
/* User clip planes. */
struct r300_atom clip_state;
- /* Shader constants. */
- struct r300_constant_buffer shader_constants[PIPE_SHADER_TYPES];
/* Depth, stencil, and alpha state. */
struct r300_atom dsa_state;
/* Fragment shader. */
/* Depth, stencil, and alpha state. */
struct r300_atom dsa_state;
/* Fragment shader. */
@@
-374,6
+370,8
@@
struct r300_context {
struct r300_atom fs_constants;
/* Framebuffer state. */
struct r300_atom fb_state;
struct r300_atom fs_constants;
/* Framebuffer state. */
struct r300_atom fb_state;
+ /* Occlusion query. */
+ struct r300_atom query_start;
/* Rasterizer state. */
struct r300_atom rs_state;
/* RS block state. */
/* Rasterizer state. */
struct r300_atom rs_state;
/* RS block state. */
@@
-388,6
+386,8
@@
struct r300_context {
struct r300_atom vap_output_state;
/* Vertex shader. */
struct r300_atom vs_state;
struct r300_atom vap_output_state;
/* Vertex shader. */
struct r300_atom vs_state;
+ /* Vertex shader constant buffer. */
+ struct r300_atom vs_constants;
/* Viewport state. */
struct r300_atom viewport_state;
/* ZTOP state. */
/* Viewport state. */
struct r300_atom viewport_state;
/* ZTOP state. */
@@
-417,8
+417,6
@@
struct r300_context {
struct pipe_viewport_state viewport;
struct pipe_viewport_state viewport;
- /* Bitmask of dirty state objects. */
- uint32_t dirty_state;
/* Flag indicating whether or not the HW is dirty. */
uint32_t dirty_hw;
/* Whether polygon offset is enabled. */
/* Flag indicating whether or not the HW is dirty. */
uint32_t dirty_hw;
/* Whether polygon offset is enabled. */