X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr600%2Fr600_resource.c;h=207642ccfa90010574cd439dc837e23940ff3822;hb=7be5455796facbe35cf1f1bdbefa83759b2e3b58;hp=292c5d294d8cd8f4ed1c6d82ddd01a9abb61ab02;hpb=742ee7935da60dda974795243d2e0fcf31accb59;p=mesa.git

diff --git a/src/gallium/drivers/r600/r600_resource.c b/src/gallium/drivers/r600/r600_resource.c
index 292c5d294d8..207642ccfa9 100644
--- a/src/gallium/drivers/r600/r600_resource.c
+++ b/src/gallium/drivers/r600/r600_resource.c
@@ -21,10 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "r600_context.h"
-#include "r600_resource.h"
-#include "r600_screen.h"
-#include "r600_texture.h"
+#include "r600_pipe.h"
 
 static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
 						const struct pipe_resource *templ)
@@ -47,7 +44,16 @@ static struct pipe_resource *r600_resource_from_handle(struct pipe_screen * scre
 	}
 }
 
-void r600_init_context_resource_functions(struct r600_context *r600)
+void r600_init_screen_resource_functions(struct pipe_screen *screen)
+{
+	screen->resource_create = r600_resource_create;
+	screen->resource_from_handle = r600_resource_from_handle;
+	screen->resource_get_handle = u_resource_get_handle_vtbl;
+	screen->resource_destroy = u_resource_destroy_vtbl;
+	screen->user_buffer_create = r600_user_buffer_create;
+}
+
+void r600_init_context_resource_functions(struct r600_pipe_context *r600)
 {
 	r600->context.get_transfer = u_get_transfer_vtbl;
 	r600->context.transfer_map = u_transfer_map_vtbl;
@@ -57,12 +63,3 @@ void r600_init_context_resource_functions(struct r600_context *r600)
 	r600->context.transfer_inline_write = u_transfer_inline_write_vtbl;
 	r600->context.is_resource_referenced = u_is_resource_referenced_vtbl;
 }
-
-void r600_init_screen_resource_functions(struct r600_screen *r600screen)
-{
-	r600screen->screen.resource_create = r600_resource_create;
-	r600screen->screen.resource_from_handle = r600_resource_from_handle;
-	r600screen->screen.resource_get_handle = u_resource_get_handle_vtbl;
-	r600screen->screen.resource_destroy = u_resource_destroy_vtbl;
-	r600screen->screen.user_buffer_create = r600_user_buffer_create;
-}