projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300g: don't return NULL in resource_from_handle if the resource is too small
[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 e5c53bf3500f1bc040329b86de62d3348416fc9d..82b2068e7a08ea5b62d8498a4a22d5167dda5528 100644
(file)
--- a/
src/gallium/drivers/r300/r300_screen.h
+++ b/
src/gallium/drivers/r300/r300_screen.h
@@
-24,23
+24,20
@@
#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 "../../winsys/radeon/drm/radeon_winsys.h"
+#include "pipe/p_screen.h"
#include "util/u_slab.h"
#include "util/u_slab.h"
-
#include <stdio.h>
#include <stdio.h>
-struct radeon_winsys;
-
struct r300_screen {
/* Parent class */
struct pipe_screen screen;
struct radeon_winsys *rws;
struct r300_screen {
/* Parent class */
struct pipe_screen screen;
struct radeon_winsys *rws;
- /* Chipset capabilities */
+ /* Chipset info and capabilities. */
+ struct radeon_info info;
struct r300_capabilities caps;
/* Memory pools. */
struct r300_capabilities caps;
/* Memory pools. */