projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300: respect radeon common code fallbacks
[mesa.git]
/
src
/
gallium
/
winsys
/
drm
/
radeon
/
core
/
radeon_drm.c
diff --git
a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index 257bdca223dd03d4f6830ef4940689ccc2f9c11b..e817a26da6ddca926a097271e35bb66be9f83698 100644
(file)
--- a/
src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/
src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@
-30,6
+30,16
@@
*/
#include "radeon_drm.h"
*/
#include "radeon_drm.h"
+#include "radeon_r300.h"
+#include "radeon_buffer.h"
+
+#include "r300_winsys.h"
+#include "trace/tr_drm.h"
+
+#include "util/u_memory.h"
+
+#include "xf86drm.h"
+#include <sys/ioctl.h>
/* Helper function to do the ioctls needed for setup and init. */
static void do_ioctls(int fd, struct radeon_winsys* winsys)
/* Helper function to do the ioctls needed for setup and init. */
static void do_ioctls(int fd, struct radeon_winsys* winsys)
@@
-132,6
+142,9
@@
struct pipe_screen* radeon_create_screen(struct drm_api* api,
if (is_r3xx(rwinsys->pci_id)) {
radeon_setup_winsys(drmFB, rwinsys);
return r300_create_screen(rwinsys);
if (is_r3xx(rwinsys->pci_id)) {
radeon_setup_winsys(drmFB, rwinsys);
return r300_create_screen(rwinsys);
+ } else {
+ FREE(rwinsys);
+ return NULL;
}
}
}
}
@@
-253,6
+266,11
@@
static boolean radeon_local_handle_from_texture(struct drm_api *api,
return TRUE;
}
return TRUE;
}
+static void radeon_drm_api_destroy(struct drm_api *api)
+{
+ return;
+}
+
struct drm_api drm_api_hooks = {
.name = "radeon",
.driver_name = "radeon",
struct drm_api drm_api_hooks = {
.name = "radeon",
.driver_name = "radeon",
@@
-260,6
+278,7
@@
struct drm_api drm_api_hooks = {
.texture_from_shared_handle = radeon_texture_from_shared_handle,
.shared_handle_from_texture = radeon_shared_handle_from_texture,
.local_handle_from_texture = radeon_local_handle_from_texture,
.texture_from_shared_handle = radeon_texture_from_shared_handle,
.shared_handle_from_texture = radeon_shared_handle_from_texture,
.local_handle_from_texture = radeon_local_handle_from_texture,
+ .destroy = radeon_drm_api_destroy,
};
struct drm_api* drm_api_create()
};
struct drm_api* drm_api_create()