radeonsi: remove si_resource.h

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index f29d8bb3f1d2d23f183cf8b043d634bec0f71c06..d48dbc02c9856d044d3ffd7748706b13e6f12c80 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -25,7 +25,6 @@
  */
 #include "../radeon/r600_cs.h"
 #include "si_pipe.h"
-#include "si_resource.h"
 #include "si_shader.h"
 
 #include "util/u_memory.h"

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index cf11fc7137cdc8ad8a0364cddb3a702a1a00984d..2ef41ae73d5de213364369ba20ebc329c038302b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -45,7 +45,6 @@
 #include "si_pipe.h"
 #include "radeon/radeon_uvd.h"
 #include "sid.h"
-#include "si_resource.h"
 #include "si_pipe.h"
 #include "si_state.h"
 #include "../radeon/r600_cs.h"

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 28287342bda9efe8da5fe5add23bc215f8cdf6cc..69f49d1fdb159f77c0fa7e9f1ca0f5098eb8ba71 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -36,7 +36,6 @@
 #include "sid.h"
 #include "si_public.h"
 #include "si_pm4.h"
-#include "si_resource.h"
 #include "si_state.h"
 
 #ifdef PIPE_ARCH_BIG_ENDIAN
@@ -81,6 +80,10 @@ struct si_textures_info {
        unsigned                        n_samplers;
 };
 
+struct si_surface {
+       struct pipe_surface             base;
+};
+
 #define SI_NUM_ATOMS(sctx) (sizeof((sctx)->atoms)/sizeof((sctx)->atoms.array[0]))
 #define SI_NUM_SHADERS (PIPE_SHADER_FRAGMENT+1)
 
@@ -226,4 +229,13 @@ static INLINE unsigned si_pack_float_12p4(float x)
               x >= 4096 ? 0xffff : x * 16;
 }
 
+static INLINE struct r600_resource *
+si_resource_create_custom(struct pipe_screen *screen,
+                         unsigned usage, unsigned size)
+{
+       assert(size);
+       return r600_resource(pipe_buffer_create(screen,
+               PIPE_BIND_CUSTOM, usage, size));
+}
+
 #endif

diff --git a/src/gallium/drivers/radeonsi/si_resource.h b/src/gallium/drivers/radeonsi/si_resource.h
deleted file mode 100644 (file)
index 3731286..0000000
--- a/src/gallium/drivers/radeonsi/si_resource.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2012 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Christian König <christian.koenig@amd.com>
- */
-
-#ifndef SI_RESOURCE_H
-#define SI_RESOURCE_H
-
-#include "../radeon/r600_pipe_common.h"
-#include "util/u_transfer.h"
-#include "util/u_inlines.h"
-
-static INLINE struct r600_resource *
-si_resource_create_custom(struct pipe_screen *screen,
-                         unsigned usage, unsigned size)
-{
-       assert(size);
-       return r600_resource(pipe_buffer_create(screen,
-               PIPE_BIND_CUSTOM, usage, size));
-}
-
-struct si_surface {
-       struct pipe_surface             base;
-};
-
-#endif