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

st/nine: Rename cso in nine_context to cso_shader

Browse Source 
This patch it to avoid name conflict when device->cso
is moved to nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy
2016-10-28 18:54:52 +02:00
parent c7237e2c5c
commit fc49f7df89
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/nine_state.c
+6 -6
View File
@@ -358,10 +358,10 @@ prepare_vs(struct NineDevice9 *device, uint8_t shader_changed)
/* likely because we dislike FF */
if (likely(context->programmable_vs)) {
context->cso.vs = NineVertexShader9_GetVariant(vs);
context->cso_shader.vs = NineVertexShader9_GetVariant(vs);
} else {
vs = device->ff.vs;
context->cso.vs = vs->ff_cso;
context->cso_shader.vs = vs->ff_cso;
}
if (context->rs[NINED3DRS_VSPOINTSIZE] != vs->point_size) {
@@ -392,10 +392,10 @@ prepare_ps(struct NineDevice9 *device, uint8_t shader_changed)
return 0;
if (likely(ps)) {
context->cso.ps = NinePixelShader9_GetVariant(ps);
context->cso_shader.ps = NinePixelShader9_GetVariant(ps);
} else {
ps = device->ff.ps;
context->cso.ps = ps->ff_cso;
context->cso_shader.ps = ps->ff_cso;
}
if ((context->bound_samplers_mask_ps & ps->sampler_mask) != ps->sampler_mask)
@@ -871,7 +871,7 @@ commit_vs(struct NineDevice9 *device)
{
struct nine_context *context = &device->context;
device->pipe->bind_vs_state(device->pipe, context->cso.vs);
device->pipe->bind_vs_state(device->pipe, context->cso_shader.vs);
}
@@ -880,7 +880,7 @@ commit_ps(struct NineDevice9 *device)
{
struct nine_context *context = &device->context;
device->pipe->bind_fs_state(device->pipe, context->cso.ps);
device->pipe->bind_fs_state(device->pipe, context->cso_shader.ps);
}
/* State Update */
src/gallium/state_trackers/nine/nine_state.h
+1 -1
View File
@@ -239,7 +239,7 @@ struct nine_context {
struct {
void *vs;
void *ps;
} cso;
} cso_shader;
uint8_t rt_mask;
src/gallium/state_trackers/nine/pixelshader9.c
+2 -2
View File
@@ -97,7 +97,7 @@ NinePixelShader9_dtor( struct NinePixelShader9 *This )
do {
if (var->cso) {
if (This->base.device->context.cso.ps == var->cso)
if (This->base.device->context.cso_shader.ps == var->cso)
pipe->bind_fs_state(pipe, NULL);
pipe->delete_fs_state(pipe, var->cso);
}
@@ -105,7 +105,7 @@ NinePixelShader9_dtor( struct NinePixelShader9 *This )
} while (var);
if (This->ff_cso) {
if (This->ff_cso == This->base.device->context.cso.ps)
if (This->ff_cso == This->base.device->context.cso_shader.ps)
pipe->bind_fs_state(pipe, NULL);
pipe->delete_fs_state(pipe, This->ff_cso);
}
src/gallium/state_trackers/nine/vertexshader9.c
+2 -2
View File
@@ -116,7 +116,7 @@ NineVertexShader9_dtor( struct NineVertexShader9 *This )
do {
if (var->cso) {
if (This->base.device->context.cso.vs == var->cso)
if (This->base.device->context.cso_shader.vs == var->cso)
pipe->bind_vs_state(pipe, NULL);
pipe->delete_vs_state(pipe, var->cso);
}
@@ -131,7 +131,7 @@ NineVertexShader9_dtor( struct NineVertexShader9 *This )
}
if (This->ff_cso) {
if (This->ff_cso == This->base.device->context.cso.vs)
if (This->ff_cso == This->base.device->context.cso_shader.vs)
pipe->bind_vs_state(pipe, NULL);
pipe->delete_vs_state(pipe, This->ff_cso);
}