fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: cleanup includes

Browse source
This commit is contained in:
Marek Olšák 2012-03-05 15:17:00 +01:00
parent 6f50d3d19d
commit 330b6c85c9
19 changed files with 41 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/r600/eg_asm.c
View file

@ -20,14 +20,12 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <errno.h>
#include "util/u_memory.h"
#include "r600_pipe.h"
#include "r600_asm.h"
#include "eg_sq.h"
#include "r600_opcodes.h"
#include "evergreend.h"
#include "util/u_memory.h"
#include "eg_sq.h"
#include <errno.h>
int eg_bytecode_cf_build(struct r600_bytecode *bc, struct r600_bytecode_cf *cf)
{

3
src/gallium/drivers/r600/evergreen_hw_context.c
View file

@ -23,12 +23,9 @@
* Authors:
* Jerome Glisse
*/
#include "r600.h"
#include "r600_hw_context_priv.h"
#include "r600_pipe.h"
#include "evergreend.h"
#include "util/u_memory.h"
#include <errno.h>
static const struct r600_reg evergreen_config_reg_list[] = {
{R_008958_VGT_PRIMITIVE_TYPE, 0},

23
src/gallium/drivers/r600/evergreen_state.c
View file

@ -20,30 +20,13 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_formats.h"
#include "evergreend.h"
#include <stdio.h>
#include <errno.h>
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_util.h"
#include "util/u_blitter.h"
#include "util/u_double_list.h"
#include "util/u_transfer.h"
#include "util/u_surface.h"
#include "pipe/p_shader_tokens.h"
#include "util/u_pack_color.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_framebuffer.h"
#include "pipebuffer/pb_buffer.h"
#include "r600.h"
#include "evergreend.h"
#include "r600_resource.h"
#include "r600_shader.h"
#include "r600_pipe.h"
#include "r600_formats.h"
static uint32_t eg_num_banks(uint32_t nbanks)
{

13
src/gallium/drivers/r600/r600_asm.c
View file

@ -20,19 +20,16 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <errno.h>
#include <byteswap.h>
#include "util/u_format.h"
#include "util/u_memory.h"
#include "pipe/p_shader_tokens.h"
#include "r600_pipe.h"
#include "r600_sq.h"
#include "r600_opcodes.h"
#include "r600_asm.h"
#include "r600_formats.h"
#include "r600d.h"
#include <errno.h>
#include <byteswap.h>
#include "util/u_memory.h"
#include "pipe/p_shader_tokens.h"
#define NUM_OF_CYCLES 3
#define NUM_OF_COMPONENTS 4

2
src/gallium/drivers/r600/r600_asm.h
View file

@ -23,6 +23,8 @@
#ifndef R600_ASM_H
#define R600_ASM_H
#include "r600.h"
struct r600_vertex_element;
struct r600_context;

2
src/gallium/drivers/r600/r600_blit.c
View file

@ -20,10 +20,10 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_pipe.h"
#include "util/u_surface.h"
#include "util/u_blitter.h"
#include "util/u_format.h"
#include "r600_pipe.h"
enum r600_blitter_op /* bitmask */
{

12
src/gallium/drivers/r600/r600_buffer.c
View file

@ -24,17 +24,9 @@
* Jerome Glisse
* Corbin Simpson <MostAwesomeDude@gmail.com>
*/
#include <byteswap.h>
#include "pipe/p_screen.h"
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_upload_mgr.h"
#include "r600.h"
#include "r600_pipe.h"
#include <byteswap.h>
#include "util/u_upload_mgr.h"
static void r600_buffer_destroy(struct pipe_screen *screen,
struct pipe_resource *buf)

1
src/gallium/drivers/r600/r600_formats.h
View file

@ -1,6 +1,7 @@
#ifndef R600_FORMATS_H
#define R600_FORMATS_H
#include "util/u_format.h"
#include "r600_pipe.h"
/* list of formats from R700 ISA document - apply across GPUs in different registers */

1
src/gallium/drivers/r600/r600_hw_context.c
View file

@ -24,7 +24,6 @@
* Jerome Glisse
*/
#include "r600_hw_context_priv.h"
#include "r600_pipe.h"
#include "r600d.h"
#include "util/u_memory.h"
#include <errno.h>

2
src/gallium/drivers/r600/r600_hw_context_priv.h
View file

@ -27,8 +27,6 @@
#define R600_PRIV_H
#include "r600_pipe.h"
#include "util/u_hash_table.h"
#include "os/os_thread.h"
#define R600_MAX_DRAW_CS_DWORDS 11

25
src/gallium/drivers/r600/r600_pipe.c
View file

@ -20,34 +20,17 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include "r600_pipe.h"
#include "r600_public.h"
#include <errno.h>
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_util.h"
#include "pipe/p_shader_tokens.h"
#include "util/u_blitter.h"
#include "util/u_double_list.h"
#include "util/u_format.h"
#include "util/u_format_s3tc.h"
#include "util/u_transfer.h"
#include "util/u_surface.h"
#include "util/u_pack_color.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_simple_shaders.h"
#include "util/u_upload_mgr.h"
#include "vl/vl_decoder.h"
#include "vl/vl_video_buffer.h"
#include "os/os_time.h"
#include "pipebuffer/pb_buffer.h"
#include "r600.h"
#include "r600d.h"
#include "r600_resource.h"
#include "r600_shader.h"
#include "r600_pipe.h"
/*
* pipe_context

8
src/gallium/drivers/r600/r600_pipe.h
View file

@ -26,16 +26,8 @@
#ifndef R600_PIPE_H
#define R600_PIPE_H
#include "../../winsys/radeon/drm/radeon_winsys.h"
#include "pipe/p_state.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "util/u_math.h"
#include "util/u_slab.h"
#include "util/u_vbuf.h"
#include "r600.h"
#include "r600_public.h"
#include "r600_shader.h"
#include "r600_resource.h"

3
src/gallium/drivers/r600/r600_resource.h
View file

@ -23,8 +23,7 @@
#ifndef R600_RESOURCE_H
#define R600_RESOURCE_H
#include "util/u_transfer.h"
#include "util/u_vbuf.h"
#include "r600.h"
/* flag to indicate a resource is to be used as a transfer so should not be tiled */
#define R600_RESOURCE_FLAG_TRANSFER PIPE_RESOURCE_FLAG_DRV_PRIV

14
src/gallium/drivers/r600/r600_shader.c
View file

@ -20,19 +20,15 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "pipe/p_shader_tokens.h"
#include "tgsi/tgsi_info.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_dump.h"
#include "util/u_format.h"
#include "r600_pipe.h"
#include "r600_asm.h"
#include "r600_sq.h"
#include "r600_formats.h"
#include "r600_opcodes.h"
#include "r600d.h"
#include <stdio.h>
#include "tgsi/tgsi_info.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_dump.h"
#include <errno.h>
#include <byteswap.h>

21
src/gallium/drivers/r600/r600_state.c
View file

@ -20,28 +20,13 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_formats.h"
#include "r600d.h"
#include <stdio.h>
#include <errno.h>
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_util.h"
#include "util/u_double_list.h"
#include "pipe/p_shader_tokens.h"
#include "util/u_pack_color.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_framebuffer.h"
#include "util/u_transfer.h"
#include "pipebuffer/pb_buffer.h"
#include "r600.h"
#include "r600d.h"
#include "r600_resource.h"
#include "r600_shader.h"
#include "r600_pipe.h"
#include "r600_formats.h"
static uint32_t r600_translate_blend_function(int blend_func)
{

10
src/gallium/drivers/r600/r600_state_common.c
View file

@ -24,16 +24,12 @@
* Authors: Dave Airlie <airlied@redhat.com>
* Jerome Glisse <jglisse@redhat.com>
*/
#include "util/u_blitter.h"
#include "util/u_memory.h"
#include "util/u_format.h"
#include "pipebuffer/pb_buffer.h"
#include "pipe/p_shader_tokens.h"
#include "tgsi/tgsi_parse.h"
#include "r600_formats.h"
#include "r600_pipe.h"
#include "r600d.h"
#include "util/u_blitter.h"
#include "tgsi/tgsi_parse.h"
static void r600_emit_command_buffer(struct r600_context *rctx, struct r600_atom *atom)
{
struct radeon_winsys_cs *cs = rctx->cs;

16
src/gallium/drivers/r600/r600_texture.c
View file

@ -24,18 +24,12 @@
* Jerome Glisse
* Corbin Simpson
*/
#include <errno.h>
#include "pipe/p_screen.h"
#include "util/u_format.h"
#include "util/u_format_s3tc.h"
#include "util/u_math.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "pipebuffer/pb_buffer.h"
#include "r600_pipe.h"
#include "r600_resource.h"
#include "r600d.h"
#include "r600_formats.h"
#include "r600d.h"
#include <errno.h>
#include "util/u_format_s3tc.h"
#include "util/u_memory.h"
/* Copy from a full GPU texture to a transfer's staging one. */
static void r600_copy_to_staging_texture(struct pipe_context *ctx, struct r600_transfer *rtransfer)

5
src/gallium/drivers/r600/r600_translate.c
View file

@ -23,10 +23,9 @@
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include "util/u_index_modify.h"
#include "util/u_inlines.h"
#include "util/u_upload_mgr.h"
#include "r600_pipe.h"
#include "util/u_index_modify.h"
#include "util/u_upload_mgr.h"
void r600_translate_index_buffer(struct r600_context *r600,

3
src/gallium/drivers/r600/r700_asm.c
View file

@ -20,9 +20,6 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include "util/u_memory.h"
#include "r600_pipe.h"
#include "r600_asm.h"
#include "r700_sq.h"