projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added few more stubs so that control reaches to DestroyDevice().
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_screen.h
diff --git
a/src/gallium/drivers/r300/r300_screen.h
b/src/gallium/drivers/r300/r300_screen.h
index 29492024fe3ab92c46411eec07031cb73eb1bea1..b28de008304a70b5c2f026b876901e27394f2093 100644
(file)
--- a/
src/gallium/drivers/r300/r300_screen.h
+++ b/
src/gallium/drivers/r300/r300_screen.h
@@
-24,31
+24,47
@@
#ifndef R300_SCREEN_H
#define R300_SCREEN_H
#ifndef R300_SCREEN_H
#define R300_SCREEN_H
-#include "pipe/p_screen.h"
-
#include "r300_chipset.h"
#include "r300_chipset.h"
-
+#include "radeon/radeon_winsys.h"
+#include "pipe/p_screen.h"
+#include "util/disk_cache.h"
+#include "util/slab.h"
+#include "os/os_thread.h"
#include <stdio.h>
struct r300_screen {
/* Parent class */
struct pipe_screen screen;
#include <stdio.h>
struct r300_screen {
/* Parent class */
struct pipe_screen screen;
- struct r
300_winsys_screen
*rws;
+ struct r
adeon_winsys
*rws;
- /* Chipset capabilities */
+ /* Chipset info and capabilities. */
+ struct radeon_info info;
struct r300_capabilities caps;
/** Combination of DBG_xxx flags */
unsigned debug;
struct r300_capabilities caps;
/** Combination of DBG_xxx flags */
unsigned debug;
+
+ struct disk_cache *disk_shader_cache;
+
+ struct slab_parent_pool pool_transfers;
+
+ /* The MSAA texture with CMASK access; */
+ struct pipe_resource *cmask_resource;
+ mtx_t cmask_mutex;
};
};
-/* Convenience cast wrapper. */
-static
INLINE
struct r300_screen* r300_screen(struct pipe_screen* screen) {
+/* Convenience cast wrapper
s
. */
+static
inline
struct r300_screen* r300_screen(struct pipe_screen* screen) {
return (struct r300_screen*)screen;
}
return (struct r300_screen*)screen;
}
+static inline struct radeon_winsys *
+radeon_winsys(struct pipe_screen *screen) {
+ return r300_screen(screen)->rws;
+}
+
/* Debug functionality. */
/**
/* Debug functionality. */
/**
@@
-61,31
+77,42
@@
static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
* those changes.
*/
/*@{*/
* those changes.
*/
/*@{*/
-#define DBG_HELP (1 << 0)
+
/* Logging. */
/* Logging. */
+#define DBG_PSC (1 << 0)
#define DBG_FP (1 << 1)
#define DBG_VP (1 << 2)
#define DBG_FP (1 << 1)
#define DBG_VP (1 << 2)
-#define DBG_
CS
(1 << 3)
+#define DBG_
SWTCL
(1 << 3)
#define DBG_DRAW (1 << 4)
#define DBG_TEX (1 << 5)
#define DBG_TEXALLOC (1 << 6)
#define DBG_RS (1 << 7)
#define DBG_DRAW (1 << 4)
#define DBG_TEX (1 << 5)
#define DBG_TEXALLOC (1 << 6)
#define DBG_RS (1 << 7)
-#define DBG_FALL (1 << 8)
-#define DBG_FB (1 << 9)
+#define DBG_FB (1 << 8)
+#define DBG_RS_BLOCK (1 << 9)
+#define DBG_CBZB (1 << 10)
+#define DBG_HYPERZ (1 << 11)
+#define DBG_SCISSOR (1 << 12)
+#define DBG_INFO (1 << 13)
+#define DBG_MSAA (1 << 14)
/* Features. */
#define DBG_ANISOHQ (1 << 16)
#define DBG_NO_TILING (1 << 17)
#define DBG_NO_IMMD (1 << 18)
/* Features. */
#define DBG_ANISOHQ (1 << 16)
#define DBG_NO_TILING (1 << 17)
#define DBG_NO_IMMD (1 << 18)
+#define DBG_NO_OPT (1 << 19)
+#define DBG_NO_CBZB (1 << 20)
+#define DBG_NO_ZMASK (1 << 21)
+#define DBG_NO_HIZ (1 << 22)
+#define DBG_NO_CMASK (1 << 23)
/* Statistics. */
/* Statistics. */
-#define DBG_
STATS (1 << 24
)
+#define DBG_
P_STAT (1 << 25
)
/*@}*/
/*@}*/
-static
INLINE
boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)
+static
inline
boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)
{
return (screen->debug & flags) ? TRUE : FALSE;
}
{
return (screen->debug & flags) ? TRUE : FALSE;
}
-static
INLINE
void SCREEN_DBG(struct r300_screen * screen, unsigned flags,
+static
inline
void SCREEN_DBG(struct r300_screen * screen, unsigned flags,
const char * fmt, ...)
{
if (SCREEN_DBG_ON(screen, flags)) {
const char * fmt, ...)
{
if (SCREEN_DBG_ON(screen, flags)) {