mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 17:23:39 +00:00
wined3d: Move the WINED3D_RS_ENABLEADAPTIVETESSELLATION stub to wined3d_device_apply_stateblock.
This commit is contained in:
parent
596bf1c60f
commit
c268e5c8aa
|
@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
|
|||
{STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}},
|
||||
{STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}},
|
||||
{STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}},
|
||||
{STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), state_nop}},
|
||||
{STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_nop}},
|
||||
/* Samplers */
|
||||
{STATE_SAMPLER(0), {STATE_SAMPLER(0), state_nop}},
|
||||
|
|
|
@ -4230,6 +4230,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
|
|||
case WINED3D_RS_MAXTESSELLATIONLEVEL:
|
||||
break;
|
||||
|
||||
case WINED3D_RS_ENABLEADAPTIVETESSELLATION:
|
||||
if (state->rs[WINED3D_RS_ENABLEADAPTIVETESSELLATION])
|
||||
FIXME("WINED3D_RS_ENABLEADAPTIVETESSELLATION %#x not yet implemented.\n",
|
||||
state->rs[WINED3D_RS_ENABLEADAPTIVETESSELLATION]);
|
||||
break;
|
||||
|
||||
default:
|
||||
wined3d_device_set_render_state(device, idx, state->rs[idx]);
|
||||
break;
|
||||
|
|
|
@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
|
|||
{STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}},
|
||||
{STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}},
|
||||
{STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}},
|
||||
{STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_VDECL}},
|
||||
{STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_VDECL}},
|
||||
/* Samplers */
|
||||
{STATE_SAMPLER(0), {STATE_VDECL}},
|
||||
|
|
|
@ -1965,13 +1965,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi
|
|||
WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n");
|
||||
}
|
||||
|
||||
static void state_tessellation(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
|
||||
{
|
||||
if (state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION])
|
||||
FIXME("WINED3D_RS_ENABLEADAPTIVETESSELLATION %#x not yet implemented.\n",
|
||||
state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]);
|
||||
}
|
||||
|
||||
static void get_src_and_opr(uint32_t arg, BOOL is_alpha, GLenum* source, GLenum* operand) {
|
||||
/* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the
|
||||
* input should be used for all input components. The WINED3DTA_COMPLEMENT
|
||||
|
@ -4589,7 +4582,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
|
|||
{ STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT },
|
||||
{ STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE },
|
||||
{ STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE },
|
||||
{ STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),{ STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),state_tessellation }, WINED3D_GL_EXT_NONE },
|
||||
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE },
|
||||
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE },
|
||||
/* Samplers */
|
||||
|
@ -5358,8 +5350,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
|
|||
{149, 150},
|
||||
{153, 153},
|
||||
{162, 165},
|
||||
{167, 183},
|
||||
{185, 193},
|
||||
{167, 193},
|
||||
{195, 209},
|
||||
{ 0, 0},
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue