r300g: Cleanup header includes.
This commit is contained in:
parent
babadb8bb9
commit
6a448a525b
|
@ -21,6 +21,7 @@
|
|||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_chipset.h"
|
||||
|
||||
#include "util/u_debug.h"
|
||||
|
||||
/* r300_chipset: A file all to itself for deducing the various properties of
|
||||
|
|
|
@ -33,11 +33,11 @@ struct r300_capabilities {
|
|||
/* Chipset family */
|
||||
int family;
|
||||
/* The number of vertex floating-point units */
|
||||
int num_vert_fpus;
|
||||
unsigned num_vert_fpus;
|
||||
/* The number of fragment pipes */
|
||||
int num_frag_pipes;
|
||||
unsigned num_frag_pipes;
|
||||
/* The number of z pipes */
|
||||
int num_z_pipes;
|
||||
unsigned num_z_pipes;
|
||||
/* Whether or not TCL is physically present */
|
||||
boolean has_tcl;
|
||||
/* Whether or not this is an RV515 or newer; R500s have many differences
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_clear.h"
|
||||
#include "r300_context.h"
|
||||
|
||||
#include "util/u_clear.h"
|
||||
|
||||
/* Clears currently bound buffers. */
|
||||
void r300_clear(struct pipe_context* pipe,
|
||||
|
|
|
@ -23,9 +23,7 @@
|
|||
#ifndef R300_CLEAR_H
|
||||
#define R300_CLEAR_H
|
||||
|
||||
#include "util/u_clear.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
struct pipe_context;
|
||||
|
||||
void r300_clear(struct pipe_context* pipe,
|
||||
unsigned buffers,
|
||||
|
|
|
@ -20,10 +20,24 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "draw/draw_context.h"
|
||||
|
||||
#include "pipe/p_inlines.h"
|
||||
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
#include "util/u_hash_table.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_simple_list.h"
|
||||
|
||||
#include "r300_clear.h"
|
||||
#include "r300_context.h"
|
||||
#include "r300_flush.h"
|
||||
#include "r300_query.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_derived.h"
|
||||
#include "r300_state_invariant.h"
|
||||
#include "r300_winsys.h"
|
||||
|
||||
static boolean r300_draw_range_elements(struct pipe_context* pipe,
|
||||
struct pipe_buffer* indexBuffer,
|
||||
|
|
|
@ -23,23 +23,10 @@
|
|||
#ifndef R300_CONTEXT_H
|
||||
#define R300_CONTEXT_H
|
||||
|
||||
#include "draw/draw_context.h"
|
||||
#include "draw/draw_vertex.h"
|
||||
|
||||
#include "pipe/p_context.h"
|
||||
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
#include "util/u_hash_table.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_simple_list.h"
|
||||
|
||||
#include "r300_clear.h"
|
||||
#include "r300_query.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_derived.h"
|
||||
#include "r300_winsys.h"
|
||||
|
||||
struct r300_fragment_shader;
|
||||
struct r300_vertex_shader;
|
||||
|
||||
|
|
|
@ -22,10 +22,15 @@
|
|||
|
||||
/* r300_emit: Functions for emitting state. */
|
||||
|
||||
#include "r300_emit.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_emit.h"
|
||||
#include "r300_fs.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_derived.h"
|
||||
#include "r300_state_inlines.h"
|
||||
#include "r300_vs.h"
|
||||
|
||||
void r300_emit_blend_state(struct r300_context* r300,
|
||||
|
|
|
@ -23,13 +23,6 @@
|
|||
#ifndef R300_EMIT_H
|
||||
#define R300_EMIT_H
|
||||
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_inlines.h"
|
||||
|
||||
struct rX00_fragment_program_code;
|
||||
struct r300_vertex_program_code;
|
||||
|
||||
|
|
|
@ -20,6 +20,13 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "draw/draw_context.h"
|
||||
#include "draw/draw_private.h"
|
||||
|
||||
#include "util/u_simple_list.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_emit.h"
|
||||
#include "r300_flush.h"
|
||||
#include "r300_state_invariant.h"
|
||||
|
|
|
@ -23,13 +23,6 @@
|
|||
#ifndef R300_FLUSH_H
|
||||
#define R300_FLUSH_H
|
||||
|
||||
#include "draw/draw_private.h"
|
||||
|
||||
#include "pipe/p_context.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
|
||||
void r300_init_flush_functions(struct r300_context* r300);
|
||||
|
||||
#endif /* R300_FLUSH_H */
|
||||
|
|
|
@ -21,10 +21,14 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_fs.h"
|
||||
#include "tgsi/tgsi_dump.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_fs.h"
|
||||
#include "r300_tgsi_to_rc.h"
|
||||
|
||||
#include "radeon_code.h"
|
||||
#include "radeon_compiler.h"
|
||||
|
||||
static void find_output_registers(struct r300_fragment_program_compiler * compiler,
|
||||
|
|
|
@ -24,14 +24,13 @@
|
|||
#ifndef R300_FS_H
|
||||
#define R300_FS_H
|
||||
|
||||
#include "tgsi/tgsi_dump.h"
|
||||
#include "pipe/p_state.h"
|
||||
|
||||
#include "tgsi/tgsi_scan.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r3xx_fs.h"
|
||||
#include "r5xx_fs.h"
|
||||
|
||||
#include "radeon_code.h"
|
||||
|
||||
struct r300_fragment_shader {
|
||||
/* Parent class */
|
||||
struct pipe_shader_state state;
|
||||
|
|
|
@ -20,9 +20,15 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_query.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_simple_list.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_emit.h"
|
||||
#include "r300_query.h"
|
||||
#include "r300_reg.h"
|
||||
|
||||
static struct pipe_query *r300_create_query(struct pipe_context *pipe,
|
||||
unsigned query_type)
|
||||
|
|
|
@ -23,10 +23,6 @@
|
|||
#ifndef R300_QUERY_H
|
||||
#define R300_QUERY_H
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_reg.h"
|
||||
|
||||
struct r300_context;
|
||||
|
||||
static INLINE struct r300_query* r300_query(struct pipe_query* q)
|
||||
|
|
|
@ -20,8 +20,11 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "draw/draw_pipe.h"
|
||||
#include "draw/draw_context.h"
|
||||
#include "draw/draw_vbuf.h"
|
||||
|
||||
#include "pipe/p_inlines.h"
|
||||
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "r300_cs.h"
|
||||
|
|
|
@ -20,7 +20,14 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "pipe/p_inlines.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_simple_screen.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_texture.h"
|
||||
#include "r300_winsys.h"
|
||||
|
||||
/* Return the identifier behind whom the brave coders responsible for this
|
||||
* amalgamation of code, sweat, and duct tape, routinely obscure their names.
|
||||
|
|
|
@ -23,14 +23,9 @@
|
|||
#ifndef R300_SCREEN_H
|
||||
#define R300_SCREEN_H
|
||||
|
||||
#include "pipe/p_inlines.h"
|
||||
#include "pipe/p_screen.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_simple_screen.h"
|
||||
|
||||
#include "r300_chipset.h"
|
||||
#include "r300_texture.h"
|
||||
#include "r300_winsys.h"
|
||||
|
||||
struct r300_screen {
|
||||
/* Parent class */
|
||||
|
|
|
@ -20,8 +20,11 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "draw/draw_context.h"
|
||||
|
||||
#include "util/u_debug.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_pack_color.h"
|
||||
|
||||
#include "tgsi/tgsi_parse.h"
|
||||
|
@ -31,6 +34,7 @@
|
|||
|
||||
#include "r300_context.h"
|
||||
#include "r300_reg.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_inlines.h"
|
||||
#include "r300_fs.h"
|
||||
#include "r300_vs.h"
|
||||
|
|
|
@ -20,9 +20,15 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_state_derived.h"
|
||||
#include "draw/draw_context.h"
|
||||
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_fs.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_derived.h"
|
||||
#include "r300_state_inlines.h"
|
||||
#include "r300_vs.h"
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#ifndef R300_STATE_INLINES_H
|
||||
#define R300_STATE_INLINES_H
|
||||
|
||||
#include "draw/draw_vertex.h"
|
||||
|
||||
#include "pipe/p_format.h"
|
||||
|
||||
#include "r300_reg.h"
|
||||
|
|
|
@ -21,9 +21,12 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_reg.h"
|
||||
#include "r300_screen.h"
|
||||
#include "r300_state_invariant.h"
|
||||
|
||||
|
||||
struct pipe_viewport_state r300_viewport_identity = {
|
||||
.scale = {1.0, 1.0, 1.0, 1.0},
|
||||
.translate = {0.0, 0.0, 0.0, 0.0},
|
||||
|
|
|
@ -23,11 +23,7 @@
|
|||
#ifndef R300_STATE_INVARIANT_H
|
||||
#define R300_STATE_INVARIANT_H
|
||||
|
||||
#include "r300_chipset.h"
|
||||
#include "r300_context.h"
|
||||
#include "r300_cs.h"
|
||||
#include "r300_reg.h"
|
||||
#include "r300_state_inlines.h"
|
||||
struct r300_context;
|
||||
|
||||
void r300_emit_invariant_state(struct r300_context* r300);
|
||||
|
||||
|
|
|
@ -20,6 +20,12 @@
|
|||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "pipe/p_screen.h"
|
||||
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_texture.h"
|
||||
|
||||
static void r300_setup_texture_state(struct r300_texture* tex)
|
||||
|
|
|
@ -23,11 +23,8 @@
|
|||
#ifndef R300_TEXTURE_H
|
||||
#define R300_TEXTURE_H
|
||||
|
||||
#include "pipe/p_screen.h"
|
||||
#include "pipe/p_video_state.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_reg.h"
|
||||
|
||||
struct r300_texture;
|
||||
|
|
Loading…
Reference in New Issue