projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-intel-dri1'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r200
/
r200_context.h
diff --git
a/src/mesa/drivers/dri/r200/r200_context.h
b/src/mesa/drivers/dri/r200/r200_context.h
index 862751bd4047b6c1f3639dfbf7be1d75fc901074..17e4d8962eac59cbeb411038f62b7e8422edf295 100644
(file)
--- a/
src/mesa/drivers/dri/r200/r200_context.h
+++ b/
src/mesa/drivers/dri/r200/r200_context.h
@@
-54,15
+54,14
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "radeon_screen.h"
#endif
#include "radeon_screen.h"
-#include "common_context.h"
-#include "common_misc.h"
+#include "radeon_common.h"
+
+#include "radeon_lock.h"
struct r200_context;
typedef struct r200_context r200ContextRec;
typedef struct r200_context *r200ContextPtr;
struct r200_context;
typedef struct r200_context r200ContextRec;
typedef struct r200_context *r200ContextPtr;
-#include "r200_lock.h"
-
#include "main/mm.h"
struct r200_vertex_program {
#include "main/mm.h"
struct r200_vertex_program {
@@
-468,10
+467,24
@@
struct r200_texture_state {
#define PRF_STATE_SIZE 3
#define PRF_STATE_SIZE 3
-struct r200_hw_state {
- /* Head of the linked list of state atoms. */
- struct radeon_state_atom atomlist;
+#define SCI_CMD_0 0
+#define SCI_RE_AUX 1
+#define SCI_CMD_1 2
+#define SCI_XY_1 3
+#define SCI_CMD_2 4
+#define SCI_XY_2 5
+#define SCI_STATE_SIZE 6
+#define R200_QUERYOBJ_CMD_0 0
+#define R200_QUERYOBJ_DATA_0 1
+#define R200_QUERYOBJ_CMDSIZE 2
+
+#define STP_CMD_0 0
+#define STP_DATA_0 1
+#define STP_CMD_1 2
+#define STP_STATE_SIZE 35
+
+struct r200_hw_state {
/* Hardware state, stored as cmdbuf commands:
* -- Need to doublebuffer for
* - reviving state after loss of context
/* Hardware state, stored as cmdbuf commands:
* -- Need to doublebuffer for
* - reviving state after loss of context
@@
-479,6
+492,7
@@
struct r200_hw_state {
*/
struct radeon_state_atom ctx;
struct radeon_state_atom set;
*/
struct radeon_state_atom ctx;
struct radeon_state_atom set;
+ struct radeon_state_atom sci;
struct radeon_state_atom vte;
struct radeon_state_atom lin;
struct radeon_state_atom msk;
struct radeon_state_atom vte;
struct radeon_state_atom lin;
struct radeon_state_atom msk;
@@
-512,15
+526,12
@@
struct r200_hw_state {
struct radeon_state_atom atf;
struct radeon_state_atom spr;
struct radeon_state_atom ptp;
struct radeon_state_atom atf;
struct radeon_state_atom spr;
struct radeon_state_atom ptp;
-
- int max_state_size; /* Number of bytes necessary for a full state emit. */
- GLboolean is_dirty, all_dirty;
+ struct radeon_state_atom stp;
};
struct r200_state {
/* Derived state for internal purposes:
*/
};
struct r200_state {
/* Derived state for internal purposes:
*/
- struct radeon_stipple_state stipple;
struct r200_texture_state texture;
GLuint envneeded;
};
struct r200_texture_state texture;
GLuint envneeded;
};
@@
-533,14
+544,6
@@
struct r200_state {
struct r200_tcl_info {
GLuint hw_primitive;
struct r200_tcl_info {
GLuint hw_primitive;
-/* hw can handle 12 components max */
- struct radeon_aos aos[12];
- GLuint nr_aos_components;
-
- GLuint *Elts;
-
- struct radeon_bo *elt_dma_bo;
- int elt_dma_offset; /** Offset into this buffer object, in bytes */
int elt_used;
};
int elt_used;
};
@@
-600,16
+603,10
@@
struct r200_context {
*/
struct radeon_ioctl ioctl;
struct radeon_store store;
*/
struct radeon_ioctl ioctl;
struct radeon_store store;
- /* A full state emit as of the first state emit in the main store, in case
- * the context is lost.
- */
- struct radeon_store backup_store;
/* Clientdata textures;
*/
/* Clientdata textures;
*/
- GLuint prefer_gart_client_texturing;
-
- GLboolean save_on_next_emit;
+ GLuint prefer_gart_client_texturing;
/* TCL stuff
*/
/* TCL stuff
*/
@@
-639,14
+636,14
@@
struct r200_context {
#define R200_CONTEXT(ctx) ((r200ContextPtr)(ctx->DriverCtx))
#define R200_CONTEXT(ctx) ((r200ContextPtr)(ctx->DriverCtx))
-extern void r200DestroyContext( __DRIcontext
Private
*driContextPriv );
+extern void r200DestroyContext( __DRIcontext *driContextPriv );
extern GLboolean r200CreateContext( const __GLcontextModes *glVisual,
extern GLboolean r200CreateContext( const __GLcontextModes *glVisual,
- __DRIcontext
Private
*driContextPriv,
+ __DRIcontext *driContextPriv,
void *sharedContextPrivate);
void *sharedContextPrivate);
-extern GLboolean r200MakeCurrent( __DRIcontext
Private
*driContextPriv,
- __DRIdrawable
Private
*driDrawPriv,
- __DRIdrawable
Private
*driReadPriv );
-extern GLboolean r200UnbindContext( __DRIcontext
Private
*driContextPriv );
+extern GLboolean r200MakeCurrent( __DRIcontext *driContextPriv,
+ __DRIdrawable *driDrawPriv,
+ __DRIdrawable *driReadPriv );
+extern GLboolean r200UnbindContext( __DRIcontext *driContextPriv );
/* ================================================================
* Debugging:
/* ================================================================
* Debugging: