From ec7d775790bef929b15e4c82d68ccaaf92c9f6b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 3 Mar 2013 14:21:34 +0100 Subject: [PATCH] r600g: remove r600_hw_context_priv.h, move the stuff to r600_pipe.h Reviewed-by: Jerome Glisse --- src/gallium/drivers/r600/evergreen_compute.c | 1 - .../drivers/r600/evergreen_compute_internal.c | 1 - src/gallium/drivers/r600/evergreen_hw_context.c | 2 +- src/gallium/drivers/r600/r600_hw_context.c | 2 +- src/gallium/drivers/r600/r600_hw_context_priv.h | 42 ---------------------- src/gallium/drivers/r600/r600_pipe.h | 11 ++++++ 6 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 src/gallium/drivers/r600/r600_hw_context_priv.h diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index f1be350..785d5e7 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -45,7 +45,6 @@ #include "r600_pipe.h" #include "r600_formats.h" #include "evergreen_compute.h" -#include "r600_hw_context_priv.h" #include "evergreen_compute_internal.h" #include "compute_memory_pool.h" #ifdef HAVE_OPENCL diff --git a/src/gallium/drivers/r600/evergreen_compute_internal.c b/src/gallium/drivers/r600/evergreen_compute_internal.c index c671478..89f8380 100644 --- a/src/gallium/drivers/r600/evergreen_compute_internal.c +++ b/src/gallium/drivers/r600/evergreen_compute_internal.c @@ -44,7 +44,6 @@ #include "evergreend.h" #include "evergreen_compute.h" #include "evergreen_compute_internal.h" -#include "r600_hw_context_priv.h" int get_compute_resource_num(void) { diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c index 88097d3..d980c18 100644 --- a/src/gallium/drivers/r600/evergreen_hw_context.c +++ b/src/gallium/drivers/r600/evergreen_hw_context.c @@ -23,7 +23,7 @@ * Authors: * Jerome Glisse */ -#include "r600_hw_context_priv.h" +#include "r600_pipe.h" #include "evergreend.h" #include "util/u_memory.h" #include "util/u_math.h" diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index c03c3b3..b4fb3bf 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -23,7 +23,7 @@ * Authors: * Jerome Glisse */ -#include "r600_hw_context_priv.h" +#include "r600_pipe.h" #include "r600d.h" #include "util/u_memory.h" #include diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h deleted file mode 100644 index 49b7a26..0000000 --- a/src/gallium/drivers/r600/r600_hw_context_priv.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010 Jerome Glisse - * - * 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: - * Jerome Glisse - */ -#ifndef R600_PRIV_H -#define R600_PRIV_H - -#include "r600_pipe.h" - -/* the number of CS dwords for flushing and drawing */ -#define R600_MAX_FLUSH_CS_DWORDS 16 -#define R600_MAX_DRAW_CS_DWORDS 34 -#define R600_TRACE_CS_DWORDS 7 - -/* - * evergreen_hw_context.c - */ -void evergreen_flush_vgt_streamout(struct r600_context *ctx); -void evergreen_set_streamout_enable(struct r600_context *ctx, unsigned buffer_enable_bit); - -#endif diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 9a3cb2c..dd92a01 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -38,6 +38,11 @@ #define R600_TRACE_CS 0 +/* the number of CS dwords for flushing and drawing */ +#define R600_MAX_FLUSH_CS_DWORDS 16 +#define R600_MAX_DRAW_CS_DWORDS 34 +#define R600_TRACE_CS_DWORDS 7 + #define R600_MAX_USER_CONST_BUFFERS 13 #define R600_MAX_DRIVER_CONST_BUFFERS 3 #define R600_MAX_CONST_BUFFERS (R600_MAX_USER_CONST_BUFFERS + R600_MAX_DRIVER_CONST_BUFFERS) @@ -735,6 +740,12 @@ unsigned r600_get_swizzle_combined(const unsigned char *swizzle_format, void r600_emit_streamout_begin(struct r600_context *ctx, struct r600_atom *atom); void r600_emit_streamout_end(struct r600_context *ctx); +/* + * evergreen_hw_context.c + */ +void evergreen_flush_vgt_streamout(struct r600_context *ctx); +void evergreen_set_streamout_enable(struct r600_context *ctx, unsigned buffer_enable_bit); + /* r600_state_common.c */ void r600_init_common_state_functions(struct r600_context *rctx); void r600_emit_cso_state(struct r600_context *rctx, struct r600_atom *atom); -- 2.7.4