fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 23:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Mark a few brw_draw_upload.c functions as non-static

Browse source 
We will reuse these for Broadwell.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Kenneth Graunke 2012-12-03 18:18:37 -08:00 • committed by Chad Versace
parent 1b35e33af4
commit f4e5c235de
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -1362,6 +1362,11 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen);
/* brw_vs.c */
gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx);
/* brw_draw_upload.c */
unsigned brw_get_vertex_surface_type(struct brw_context *brw,
const struct gl_client_array *glarray);
unsigned brw_get_index_type(GLenum type);
/* brw_wm_surface_state.c */
void brw_init_surface_formats(struct brw_context *brw);
void

16
src/mesa/drivers/dri/i965/brw_draw_upload.c
View file

@ -222,9 +222,9 @@ static GLuint byte_types_scale[5] = {
* the appopriate hardware surface type.
* Format will be GL_RGBA or possibly GL_BGRA for GLubyte[4] color arrays.
*/
static unsigned
get_surface_type(struct brw_context *brw,
const struct gl_client_array *glarray)
unsigned
brw_get_vertex_surface_type(struct brw_context *brw,
const struct gl_client_array *glarray)
{
int size = glarray->Size;
@ -342,7 +342,8 @@ get_surface_type(struct brw_context *brw,
}
}
static GLuint get_index_type(GLenum type)
unsigned
brw_get_index_type(GLenum type)
{
switch (type) {
case GL_UNSIGNED_BYTE: return BRW_INDEX_BYTE;
@ -687,7 +688,7 @@ static void brw_emit_vertices(struct brw_context *brw)
OUT_BATCH((_3DSTATE_VERTEX_ELEMENTS << 16) | (2 * nr_elements - 1));
for (i = 0; i < brw->vb.nr_enabled; i++) {
struct brw_vertex_element *input = brw->vb.enabled[i];
uint32_t format = get_surface_type(brw, input->glarray);
uint32_t format = brw_get_vertex_surface_type(brw, input->glarray);
uint32_t comp0 = BRW_VE1_COMPONENT_STORE_SRC;
uint32_t comp1 = BRW_VE1_COMPONENT_STORE_SRC;
uint32_t comp2 = BRW_VE1_COMPONENT_STORE_SRC;
@ -748,7 +749,8 @@ static void brw_emit_vertices(struct brw_context *brw)
}
if (brw->gen >= 6 && gen6_edgeflag_input) {
uint32_t format = get_surface_type(brw, gen6_edgeflag_input->glarray);
uint32_t format =
brw_get_vertex_surface_type(brw, gen6_edgeflag_input->glarray);
OUT_BATCH((gen6_edgeflag_input->buffer << GEN6_VE0_INDEX_SHIFT) |
GEN6_VE0_VALID |
@ -900,7 +902,7 @@ static void brw_emit_index_buffer(struct brw_context *brw)
BEGIN_BATCH(3);
OUT_BATCH(CMD_INDEX_BUFFER << 16 |
cut_index_setting |
get_index_type(index_buffer->type) << 8 |
brw_get_index_type(index_buffer->type) << 8 |
1);
OUT_RELOC(brw->ib.bo,
I915_GEM_DOMAIN_VERTEX, 0,