summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Render.cpp
diff options
context:
space:
mode:
authorYuriy O'Donnell <yuriyo@gmail.com>2014-06-09 11:55:25 +0200
committerYuriy O'Donnell <yuriyo@gmail.com>2014-10-15 20:22:40 +0200
commite7f8032d7dba8077217d2f42a6ecc2a765a49a73 (patch)
tree938d19030ae9a656cf4d0fcc2b213e91d36e14bb /Source/Core/VideoBackends/D3D/Render.cpp
parent2e4667caaa517392e8fbce00af5cf189d8960f2c (diff)
D3D: State cache now uses BitField to define packed render states
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 655000f72b..d3bd091017 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -614,7 +614,7 @@ void Renderer::SetBlendMode(bool forceUpdate)
}
else
{
- gx_state.blend.blend_enable = bpmem.blendmode.blendenable;
+ gx_state.blend.blend_enable = (u32)bpmem.blendmode.blendenable;
if (bpmem.blendmode.blendenable)
{
SetBlendOp(D3D11_BLEND_OP_ADD);
@@ -1213,15 +1213,15 @@ void Renderer::SetSamplerState(int stage, int texindex)
}
else
{
- gx_state.sampler[stage].min_filter = tm0.min_filter;
- gx_state.sampler[stage].mag_filter = tm0.mag_filter;
+ gx_state.sampler[stage].min_filter = (u32)tm0.min_filter;
+ gx_state.sampler[stage].mag_filter = (u32)tm0.mag_filter;
}
- gx_state.sampler[stage].wrap_s = tm0.wrap_s;
- gx_state.sampler[stage].wrap_t = tm0.wrap_t;
- gx_state.sampler[stage].max_lod = tm1.max_lod;
- gx_state.sampler[stage].min_lod = tm1.min_lod;
- gx_state.sampler[stage].lod_bias = tm0.lod_bias;
+ gx_state.sampler[stage].wrap_s = (u32)tm0.wrap_s;
+ gx_state.sampler[stage].wrap_t = (u32)tm0.wrap_t;
+ gx_state.sampler[stage].max_lod = (u32)tm1.max_lod;
+ gx_state.sampler[stage].min_lod = (u32)tm1.min_lod;
+ gx_state.sampler[stage].lod_bias = (s32)tm0.lod_bias;
}
void Renderer::SetInterlacingMode()