r600g: remove r600_hw_context_priv.h, move the stuff to r600_pipe.h
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
parent
1724ef8908
commit
ec7d775790
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 <errno.h>
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
* Copyright 2010 Jerome Glisse <glisse@freedesktop.org>
|
||||
*
|
||||
* 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
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue