summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_context.h
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2010-02-22 17:26:30 +1000
committerDave Airlie <[email protected]>2010-02-22 17:26:35 +1000
commitb14548ea32000459f4f0c4b49f3fa11d1ee9c003 (patch)
treec6034ea6d6cdfb7669a11bed5b066c2345b7c48d /src/gallium/drivers/r300/r300_context.h
parentfff5be8e7b4557c221f2425dcafc2e7cbbba76ba (diff)
Revert "r300g: rebuild winsys/pipe buffer handling and add buffer map"
This reverts commit fff5be8e7b4557c221f2425dcafc2e7cbbba76ba. Probably went too soon with this, dileX reported OA not working for him it works here fine, but the optimisations I wanted aren't working properly yet so I'll fix that now. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
-rw-r--r--src/gallium/drivers/r300/r300_context.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 749bac04987..443af4ec2e3 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -32,7 +32,6 @@
#include "r300_screen.h"
-struct u_upload_mgr;
struct r300_context;
struct r300_fragment_shader;
@@ -239,7 +238,7 @@ struct r300_texture {
boolean is_npot;
/* Pipe buffer backing this texture. */
- struct r300_winsys_buffer *buffer;
+ struct pipe_buffer* buffer;
/* Registers carrying texture format data. */
struct r300_texture_state state;
@@ -266,7 +265,7 @@ struct r300_context {
struct pipe_context context;
/* The interface to the windowing system, etc. */
- struct r300_winsys_screen *rws;
+ struct radeon_winsys* winsys;
/* Draw module. Used mostly for SW TCL. */
struct draw_context* draw;
/* Accelerated blit support. */
@@ -331,7 +330,6 @@ struct r300_context {
/* Vertex elements for Gallium. */
struct pipe_vertex_element vertex_element[PIPE_MAX_ATTRIBS];
int vertex_element_count;
- bool any_user_vbs;
struct pipe_stencil_ref stencil_ref;
@@ -345,9 +343,6 @@ struct r300_context {
boolean polygon_offset_enabled;
/* Z buffer bit depth. */
uint32_t zbuffer_bpp;
-
- struct u_upload_mgr *upload_vb;
- struct u_upload_mgr *upload_ib;
};
/* Convenience cast wrapper. */