diff options
| author | Tom Stellard <[email protected]> | 2014-01-28 06:51:50 -0800 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2014-01-28 07:24:11 -0800 |
| commit | 7b4592a489a4473bc886ceea11470231e7a98b0f (patch) | |
| tree | 795c647ed746b3798d0a67dfc72f57ea549743ec | |
| parent | f29968b2709f0c4bc2fe981fe791094f70d11044 (diff) | |
r600g,radeonsi: Don't set resource_create in r600_common_screen_init()
r600g and radeonsi have different implementations of resource_create.
https://bugs.freedesktop.org/show_bug.cgi?id=74139
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index f40adf23565..98164f0fb5c 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -598,7 +598,6 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, rscreen->b.fence_finish = r600_fence_finish; rscreen->b.fence_reference = r600_fence_reference; rscreen->b.fence_signalled = r600_fence_signalled; - rscreen->b.resource_create = r600_resource_create_common; rscreen->b.resource_destroy = u_resource_destroy_vtbl; if (rscreen->info.has_uvd) { diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 2249f79c5c5..5182ec1d478 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -413,6 +413,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) sscreen->b.b.get_param = si_get_param; sscreen->b.b.get_shader_param = si_get_shader_param; sscreen->b.b.is_format_supported = si_is_format_supported; + sscreen->b.b.resource_create = r600_resource_create_common; if (!r600_common_screen_init(&sscreen->b, ws)) { FREE(sscreen); |