AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/nine: Move stream_usage_mask to nine_context

Browse Source 
Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy
2016-10-16 17:49:09 +02:00
parent eed47b748f
commit aea7a019ef
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/nine_state.c
+3 -3
View File
@@ -607,7 +607,7 @@ update_vertex_elements(struct NineDevice9 *device)
BOOL need_dummy_vbo = FALSE;
struct pipe_vertex_element ve[PIPE_MAX_ATTRIBS];
state->stream_usage_mask = 0;
context->stream_usage_mask = 0;
memset(vdecl_index_map, -1, 16);
memset(used_streams, 0, device->caps.MaxStreams);
vs = state->programmable_vs ? device->state.vs : device->ff.vs;
@@ -650,7 +650,7 @@ update_vertex_elements(struct NineDevice9 *device)
if (index >= 0) {
ve[n] = vdecl->elems[index];
b = ve[n].vertex_buffer_index;
state->stream_usage_mask |= 1 << b;
context->stream_usage_mask |= 1 << b;
/* XXX wine just uses 1 here: */
if (state->stream_freq[b] & D3DSTREAMSOURCE_INSTANCEDATA)
ve[n].instance_divisor = state->stream_freq[b] & 0x7FFFFF;
@@ -1438,7 +1438,7 @@ init_draw_info(struct pipe_draw_info *info,
info->count = prim_count_to_vertex_count(type, count);
info->start_instance = 0;
info->instance_count = 1;
if (dev->state.stream_instancedata_mask & dev->state.stream_usage_mask)
if (dev->state.stream_instancedata_mask & dev->context.stream_usage_mask)
info->instance_count = MAX2(dev->state.stream_freq[0] & 0x7FFFFF, 1);
info->primitive_restart = FALSE;
info->restart_index = 0;
src/gallium/state_trackers/nine/nine_state.h
+2 -1
View File
@@ -181,7 +181,6 @@ struct nine_state
struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
UINT stream_freq[PIPE_MAX_ATTRIBS];
uint32_t stream_instancedata_mask; /* derived from stream_freq */
uint32_t stream_usage_mask; /* derived from VS and vdecl */
struct pipe_clip_state clip;
@@ -225,6 +224,8 @@ struct nine_context {
uint8_t rt_mask;
uint32_t stream_usage_mask; /* derived from VS and vdecl */
DWORD rs[NINED3DRS_COUNT];
struct NineBaseTexture9 *texture[NINE_MAX_SAMPLERS];