Skip to content

Commit

Permalink
sokol_gfx.h: fix merge problem when setting D3D11 input layout label
Browse files Browse the repository at this point in the history
  • Loading branch information
floooh committed Apr 29, 2024
1 parent 4fac1bb commit fcd5f96
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sokol_gfx.h
Expand Up @@ -10724,8 +10724,8 @@ _SOKOL_PRIVATE sg_resource_state _sg_d3d11_create_pipeline(_sg_pipeline_t* pip,
_SG_ERROR(D3D11_CREATE_INPUT_LAYOUT_FAILED);
return SG_RESOURCESTATE_FAILED;
}
_sg_d3d11_setlabel(pip->d3d11.il, desc->label);
}
_sg_d3d11_setlabel(pip->d3d11.il, desc->label);

// create rasterizer state
D3D11_RASTERIZER_DESC rs_desc;
Expand Down

0 comments on commit fcd5f96

Please sign in to comment.