nine_csmt_wait_processed(ctx);
nine_queue_delete(ctx->pool);
+
+ mtx_destroy(&ctx->thread_resume);
+ mtx_destroy(&ctx->thread_running);
+
mtx_destroy(&ctx->mutex_processed);
+ cnd_destroy(&ctx->event_processed);
FREE(ctx);
{
struct nine_context *context = &device->context;
- nine_state_light_enable(&context->ff, &context->changed.group, Index, Enable);
+ nine_state_light_enable(&context->ff, Index, Enable);
+ context->changed.group |= NINE_STATE_FF_LIGHTING;
}
CSMT_ITEM_NO_WAIT(nine_context_set_texture_stage_state,
context->changed.group |= NINE_STATE_PS_CONST;
}
- context->changed.group |= NINE_STATE_FF_PSSTAGES;
+ context->changed.group |= NINE_STATE_FF_PS_CONSTS;
context->ff.changed.tex_stage[Stage][Type / 32] |= 1 << (Type % 32);
}
context->changed.group |= NINE_STATE_SWVP;
}
-#if 0
-
-void
-nine_context_apply_stateblock(struct NineDevice9 *device,
- const struct nine_state *src)
-{
- struct nine_context *context = &device->context;
- int i;
-
- context->changed.group |= src->changed.group;
-
- for (i = 0; i < ARRAY_SIZE(src->changed.rs); ++i) {
- uint32_t m = src->changed.rs[i];
- while (m) {
- const int r = ffs(m) - 1;
- m &= ~(1 << r);
- context->rs[i * 32 + r] = nine_fix_render_state_value(i * 32 + r, src->rs_advertised[i * 32 + r]);
- }
- }
-
- /* Textures */
- if (src->changed.texture) {
- uint32_t m = src->changed.texture;
- unsigned s;
-
- for (s = 0; m; ++s, m >>= 1) {
- struct NineBaseTexture9 *tex = src->texture[s];
- if (!(m & 1))
- continue;
- nine_context_set_texture(device, s, tex);
- }
- }
-
- /* Sampler state */
- if (src->changed.group & NINE_STATE_SAMPLER) {
- unsigned s;
-
- for (s = 0; s < NINE_MAX_SAMPLERS; ++s) {
- uint32_t m = src->changed.sampler[s];
- while (m) {
- const int i = ffs(m) - 1;
- m &= ~(1 << i);
- if (nine_check_sampler_state_value(i, src->samp_advertised[s][i]))
- context->samp[s][i] = src->samp_advertised[s][i];
- }
- context->changed.sampler[s] |= src->changed.sampler[s];
- }
- }
-
- /* Vertex buffers */
- if (src->changed.vtxbuf | src->changed.stream_freq) {
- uint32_t m = src->changed.vtxbuf | src->changed.stream_freq;
- for (i = 0; m; ++i, m >>= 1) {
- if (src->changed.vtxbuf & (1 << i)) {
- if (src->stream[i]) {
- unsigned offset = 0;
- pipe_resource_reference(&context->vtxbuf[i].buffer,
- src->stream[i] ? NineVertexBuffer9_GetResource(src->stream[i], &offset) : NULL);
- context->vtxbuf[i].buffer_offset = src->vtxbuf[i].buffer_offset + offset;
- context->vtxbuf[i].stride = src->vtxbuf[i].stride;
- }
- }
- if (src->changed.stream_freq & (1 << i)) {
- context->stream_freq[i] = src->stream_freq[i];
- if (src->stream_freq[i] & D3DSTREAMSOURCE_INSTANCEDATA)
- context->stream_instancedata_mask |= 1 << i;
- else
- context->stream_instancedata_mask &= ~(1 << i);
- }
- }
- context->changed.vtxbuf |= src->changed.vtxbuf;
- }
-
- /* Index buffer */
- if (src->changed.group & NINE_STATE_IDXBUF)
- nine_context_set_indices(device, src->idxbuf);
-
- /* Vertex declaration */
- if ((src->changed.group & NINE_STATE_VDECL) && src->vdecl)
- nine_context_set_vertex_declaration(device, src->vdecl);
-
- /* Vertex shader */
- if (src->changed.group & NINE_STATE_VS)
- nine_bind(&context->vs, src->vs);
-
- context->programmable_vs = context->vs && !(context->vdecl && context->vdecl->position_t);
-
- /* Pixel shader */
- if (src->changed.group & NINE_STATE_PS)
- nine_bind(&context->ps, src->ps);
-
- /* Vertex constants */
- if (src->changed.group & NINE_STATE_VS_CONST) {
- struct nine_range *r;
- if (device->may_swvp) {
- for (r = src->changed.vs_const_f; r; r = r->next) {
- int bgn = r->bgn;
- int end = r->end;
- memcpy(&context->vs_const_f_swvp[bgn * 4],
- &src->vs_const_f[bgn * 4],
- (end - bgn) * 4 * sizeof(float));
- if (bgn < device->max_vs_const_f) {
- end = MIN2(end, device->max_vs_const_f);
- memcpy(&context->vs_const_f[bgn * 4],
- &src->vs_const_f[bgn * 4],
- (end - bgn) * 4 * sizeof(float));
- }
- }
- } else {
- for (r = src->changed.vs_const_f; r; r = r->next) {
- memcpy(&context->vs_const_f[r->bgn * 4],
- &src->vs_const_f[r->bgn * 4],
- (r->end - r->bgn) * 4 * sizeof(float));
- }
- }
- for (r = src->changed.vs_const_i; r; r = r->next) {
- memcpy(&context->vs_const_i[r->bgn * 4],
- &src->vs_const_i[r->bgn * 4],
- (r->end - r->bgn) * 4 * sizeof(int));
- }
- for (r = src->changed.vs_const_b; r; r = r->next) {
- memcpy(&context->vs_const_b[r->bgn],
- &src->vs_const_b[r->bgn],
- (r->end - r->bgn) * sizeof(int));
- }
- context->changed.vs_const_f = !!src->changed.vs_const_f;
- context->changed.vs_const_i = !!src->changed.vs_const_i;
- context->changed.vs_const_b = !!src->changed.vs_const_b;
- }
-
- /* Pixel constants */
- if (src->changed.group & NINE_STATE_PS_CONST) {
- struct nine_range *r;
- for (r = src->changed.ps_const_f; r; r = r->next) {
- memcpy(&context->ps_const_f[r->bgn * 4],
- &src->ps_const_f[r->bgn * 4],
- (r->end - r->bgn) * 4 * sizeof(float));
- }
- if (src->changed.ps_const_i) {
- uint16_t m = src->changed.ps_const_i;
- for (i = ffs(m) - 1, m >>= i; m; ++i, m >>= 1)
- if (m & 1)
- memcpy(context->ps_const_i[i], src->ps_const_i[i], 4 * sizeof(int));
- }
- if (src->changed.ps_const_b) {
- uint16_t m = src->changed.ps_const_b;
- for (i = ffs(m) - 1, m >>= i; m; ++i, m >>= 1)
- if (m & 1)
- context->ps_const_b[i] = src->ps_const_b[i];
- }
- context->changed.ps_const_f = !!src->changed.ps_const_f;
- context->changed.ps_const_i = !!src->changed.ps_const_i;
- context->changed.ps_const_b = !!src->changed.ps_const_b;
- }
-
- /* Viewport */
- if (src->changed.group & NINE_STATE_VIEWPORT)
- context->viewport = src->viewport;
-
- /* Scissor */
- if (src->changed.group & NINE_STATE_SCISSOR)
- context->scissor = src->scissor;
-
- /* User Clip Planes */
- if (src->changed.ucp) {
- for (i = 0; i < PIPE_MAX_CLIP_PLANES; ++i)
- if (src->changed.ucp & (1 << i))
- memcpy(context->clip.ucp[i],
- src->clip.ucp[i], sizeof(src->clip.ucp[0]));
- context->changed.ucp = TRUE;
- }
-
- if (!(src->changed.group & NINE_STATE_FF))
- return;
-
- /* Fixed function state. */
-
- if (src->changed.group & NINE_STATE_FF_MATERIAL)
- context->ff.material = src->ff.material;
-
- if (src->changed.group & NINE_STATE_FF_PSSTAGES) {
- unsigned s;
- for (s = 0; s < NINE_MAX_TEXTURE_STAGES; ++s) {
- for (i = 0; i < NINED3DTSS_COUNT; ++i)
- if (src->ff.changed.tex_stage[s][i / 32] & (1 << (i % 32)))
- context->ff.tex_stage[s][i] = src->ff.tex_stage[s][i];
- }
- }
- if (src->changed.group & NINE_STATE_FF_LIGHTING) {
- unsigned num_lights = MAX2(context->ff.num_lights, src->ff.num_lights);
- /* Can happen if the stateblock had recorded the creation of
- * new lights. */
- if (context->ff.num_lights < num_lights) {
- context->ff.light = REALLOC(context->ff.light,
- context->ff.num_lights * sizeof(D3DLIGHT9),
- num_lights * sizeof(D3DLIGHT9));
- memset(&context->ff.light[context->ff.num_lights], 0, (num_lights - context->ff.num_lights) * sizeof(D3DLIGHT9));
- for (i = context->ff.num_lights; i < num_lights; ++i)
- context->ff.light[i].Type = (D3DLIGHTTYPE)NINED3DLIGHT_INVALID;
- context->ff.num_lights = num_lights;
- }
- /* src->ff.num_lights < num_lights has been handled before */
- assert (src->ff.num_lights == num_lights);
-
- for (i = 0; i < num_lights; ++i)
- if (src->ff.light[i].Type != NINED3DLIGHT_INVALID)
- context->ff.light[i] = src->ff.light[i];
-
- memcpy(context->ff.active_light, src->ff.active_light, sizeof(src->ff.active_light) );
- context->ff.num_lights_active = src->ff.num_lights_active;
- }
- if (src->changed.group & NINE_STATE_FF_VSTRANSF) {
- for (i = 0; i < ARRAY_SIZE(src->ff.changed.transform); ++i) {
- unsigned s;
- if (!src->ff.changed.transform[i])
- continue;
- for (s = i * 32; s < (i * 32 + 32); ++s) {
- if (!(src->ff.changed.transform[i] & (1 << (s % 32))))
- continue;
- *nine_state_access_transform(&context->ff, s, TRUE) =
- *nine_state_access_transform( /* const because !alloc */
- (struct nine_ff_state *)&src->ff, s, FALSE);
- }
- context->ff.changed.transform[i] |= src->ff.changed.transform[i];
- }
- }
-}
-
-#endif
-
/* Do not write to nine_context directly. Slower,
* but works with csmt. TODO: write a special csmt version that
* would record the list of commands as much as possible,
if (src->changed.group & NINE_STATE_FF_MATERIAL)
nine_context_set_material(device, &src->ff.material);
- if (src->changed.group & NINE_STATE_FF_PSSTAGES) {
+ if (src->changed.group & NINE_STATE_FF_PS_CONSTS) {
unsigned s;
for (s = 0; s < NINE_MAX_TEXTURE_STAGES; ++s) {
for (i = 0; i < NINED3DTSS_COUNT; ++i)
for (s = i * 32; s < (i * 32 + 32); ++s) {
if (!(src->ff.changed.transform[i] & (1 << (s % 32))))
continue;
+ /* MaxVertexBlendMatrixIndex is 8, which means
+ * we don't read past index D3DTS_WORLDMATRIX(8).
+ * swvp is supposed to allow all 256, but we don't
+ * implement it for now. */
+ if (s > D3DTS_WORLDMATRIX(8))
+ break;
nine_context_set_transform(device, s,
nine_state_access_transform(
(struct nine_ff_state *)&src->ff,
[D3DRS_ALPHAFUNC] = NINE_STATE_DSA,
[D3DRS_DITHERENABLE] = NINE_STATE_BLEND,
[D3DRS_ALPHABLENDENABLE] = NINE_STATE_BLEND,
- [D3DRS_FOGENABLE] = NINE_STATE_FF_OTHER | NINE_STATE_VS_PARAMS_MISC | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST,
+ [D3DRS_FOGENABLE] = NINE_STATE_FF_SHADER | NINE_STATE_VS_PARAMS_MISC | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST,
[D3DRS_SPECULARENABLE] = NINE_STATE_FF_LIGHTING,
- [D3DRS_FOGCOLOR] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST,
- [D3DRS_FOGTABLEMODE] = NINE_STATE_FF_OTHER | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST,
- [D3DRS_FOGSTART] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST,
- [D3DRS_FOGEND] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST,
- [D3DRS_FOGDENSITY] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST,
- [D3DRS_RANGEFOGENABLE] = NINE_STATE_FF_OTHER,
+ [D3DRS_FOGCOLOR] = NINE_STATE_FF_PS_CONSTS | NINE_STATE_PS_CONST,
+ [D3DRS_FOGTABLEMODE] = NINE_STATE_FF_SHADER | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST,
+ [D3DRS_FOGSTART] = NINE_STATE_FF_VS_OTHER | NINE_STATE_FF_PS_CONSTS | NINE_STATE_PS_CONST,
+ [D3DRS_FOGEND] = NINE_STATE_FF_VS_OTHER | NINE_STATE_FF_PS_CONSTS | NINE_STATE_PS_CONST,
+ [D3DRS_FOGDENSITY] = NINE_STATE_FF_VS_OTHER | NINE_STATE_FF_PS_CONSTS | NINE_STATE_PS_CONST,
+ [D3DRS_RANGEFOGENABLE] = NINE_STATE_FF_SHADER,
[D3DRS_STENCILENABLE] = NINE_STATE_DSA | NINE_STATE_MULTISAMPLE,
[D3DRS_STENCILFAIL] = NINE_STATE_DSA,
[D3DRS_STENCILZFAIL] = NINE_STATE_DSA,
[D3DRS_STENCILREF] = NINE_STATE_STENCIL_REF,
[D3DRS_STENCILMASK] = NINE_STATE_DSA,
[D3DRS_STENCILWRITEMASK] = NINE_STATE_DSA,
- [D3DRS_TEXTUREFACTOR] = NINE_STATE_FF_PSSTAGES,
+ [D3DRS_TEXTUREFACTOR] = NINE_STATE_FF_PS_CONSTS,
[D3DRS_WRAP0] = NINE_STATE_UNHANDLED, /* cylindrical wrap is crazy */
[D3DRS_WRAP1] = NINE_STATE_UNHANDLED,
[D3DRS_WRAP2] = NINE_STATE_UNHANDLED,
[D3DRS_CLIPPING] = 0, /* software vertex processing only */
[D3DRS_LIGHTING] = NINE_STATE_FF_LIGHTING,
[D3DRS_AMBIENT] = NINE_STATE_FF_LIGHTING | NINE_STATE_FF_MATERIAL,
- [D3DRS_FOGVERTEXMODE] = NINE_STATE_FF_OTHER,
+ [D3DRS_FOGVERTEXMODE] = NINE_STATE_FF_SHADER,
[D3DRS_COLORVERTEX] = NINE_STATE_FF_LIGHTING,
[D3DRS_LOCALVIEWER] = NINE_STATE_FF_LIGHTING,
- [D3DRS_NORMALIZENORMALS] = NINE_STATE_FF_OTHER,
+ [D3DRS_NORMALIZENORMALS] = NINE_STATE_FF_SHADER,
[D3DRS_DIFFUSEMATERIALSOURCE] = NINE_STATE_FF_LIGHTING,
[D3DRS_SPECULARMATERIALSOURCE] = NINE_STATE_FF_LIGHTING,
[D3DRS_AMBIENTMATERIALSOURCE] = NINE_STATE_FF_LIGHTING,
[D3DRS_EMISSIVEMATERIALSOURCE] = NINE_STATE_FF_LIGHTING,
- [D3DRS_VERTEXBLEND] = NINE_STATE_FF_OTHER,
+ [D3DRS_VERTEXBLEND] = NINE_STATE_FF_SHADER,
[D3DRS_CLIPPLANEENABLE] = NINE_STATE_RASTERIZER,
- [D3DRS_POINTSIZE] = NINE_STATE_RASTERIZER,
- [D3DRS_POINTSIZE_MIN] = NINE_STATE_RASTERIZER | NINE_STATE_VS_PARAMS_MISC,
+ [D3DRS_POINTSIZE] = NINE_STATE_RASTERIZER | NINE_STATE_FF_VS_OTHER,
+ [D3DRS_POINTSIZE_MIN] = NINE_STATE_RASTERIZER | NINE_STATE_FF_VS_OTHER | NINE_STATE_VS_PARAMS_MISC,
[D3DRS_POINTSPRITEENABLE] = NINE_STATE_RASTERIZER,
- [D3DRS_POINTSCALEENABLE] = NINE_STATE_FF_OTHER,
- [D3DRS_POINTSCALE_A] = NINE_STATE_FF_OTHER,
- [D3DRS_POINTSCALE_B] = NINE_STATE_FF_OTHER,
- [D3DRS_POINTSCALE_C] = NINE_STATE_FF_OTHER,
+ [D3DRS_POINTSCALEENABLE] = NINE_STATE_FF_SHADER,
+ [D3DRS_POINTSCALE_A] = NINE_STATE_FF_VS_OTHER,
+ [D3DRS_POINTSCALE_B] = NINE_STATE_FF_VS_OTHER,
+ [D3DRS_POINTSCALE_C] = NINE_STATE_FF_VS_OTHER,
[D3DRS_MULTISAMPLEANTIALIAS] = NINE_STATE_MULTISAMPLE,
[D3DRS_MULTISAMPLEMASK] = NINE_STATE_SAMPLE_MASK,
[D3DRS_PATCHEDGESTYLE] = NINE_STATE_UNHANDLED,
[D3DRS_DEBUGMONITORTOKEN] = NINE_STATE_UNHANDLED,
- [D3DRS_POINTSIZE_MAX] = NINE_STATE_RASTERIZER | NINE_STATE_VS_PARAMS_MISC,
- [D3DRS_INDEXEDVERTEXBLENDENABLE] = NINE_STATE_FF_OTHER,
+ [D3DRS_POINTSIZE_MAX] = NINE_STATE_RASTERIZER | NINE_STATE_FF_VS_OTHER | NINE_STATE_VS_PARAMS_MISC,
+ [D3DRS_INDEXEDVERTEXBLENDENABLE] = NINE_STATE_FF_SHADER,
[D3DRS_COLORWRITEENABLE] = NINE_STATE_BLEND,
- [D3DRS_TWEENFACTOR] = NINE_STATE_FF_OTHER,
+ [D3DRS_TWEENFACTOR] = NINE_STATE_FF_VS_OTHER,
[D3DRS_BLENDOP] = NINE_STATE_BLEND,
[D3DRS_POSITIONDEGREE] = NINE_STATE_UNHANDLED,
[D3DRS_NORMALDEGREE] = NINE_STATE_UNHANDLED,
/* Misc */
+static D3DMATRIX nine_state_identity = { .m[0] = { 1, 0, 0, 0 },
+ .m[1] = { 0, 1, 0, 0 },
+ .m[2] = { 0, 0, 1, 0 },
+ .m[3] = { 0, 0, 0, 1 } };
+
+void
+nine_state_resize_transform(struct nine_ff_state *ff_state, unsigned N)
+{
+ unsigned n = ff_state->num_transforms;
+
+ if (N <= n)
+ return;
+
+ ff_state->transform = REALLOC(ff_state->transform,
+ n * sizeof(D3DMATRIX),
+ N * sizeof(D3DMATRIX));
+ for (; n < N; ++n)
+ ff_state->transform[n] = nine_state_identity;
+ ff_state->num_transforms = N;
+}
+
D3DMATRIX *
nine_state_access_transform(struct nine_ff_state *ff_state, D3DTRANSFORMSTATETYPE t,
boolean alloc)
{
- static D3DMATRIX Identity = { .m[0] = { 1, 0, 0, 0 },
- .m[1] = { 0, 1, 0, 0 },
- .m[2] = { 0, 0, 1, 0 },
- .m[3] = { 0, 0, 0, 1 } };
unsigned index;
switch (t) {
}
if (index >= ff_state->num_transforms) {
- unsigned N = index + 1;
- unsigned n = ff_state->num_transforms;
-
if (!alloc)
- return &Identity;
- ff_state->transform = REALLOC(ff_state->transform,
- n * sizeof(D3DMATRIX),
- N * sizeof(D3DMATRIX));
- for (; n < N; ++n)
- ff_state->transform[n] = Identity;
- ff_state->num_transforms = N;
+ return &nine_state_identity;
+ nine_state_resize_transform(ff_state, index + 1);
}
return &ff_state->transform[index];
}
}
HRESULT
-nine_state_light_enable(struct nine_ff_state *ff_state, uint32_t *change_group,
+nine_state_light_enable(struct nine_ff_state *ff_state,
DWORD Index, BOOL Enable)
{
unsigned i;
ff_state->active_light[i] = ff_state->active_light[i + 1];
}
- *change_group |= NINE_STATE_FF_LIGHTING;
-
return D3D_OK;
}
projects / mesa.git / blobdiff