backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d9] Only define the push constants we use

Browse Source 
Fixes #1742
This commit is contained in:
Joshua Ashton 2020-09-26 06:30:17 +01:00
parent 753fcd5649
commit c3fdc768cf
3 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/d3d9/d3d9_fixed_function.cpp
View File

@ -199,7 +199,7 @@ namespace dxvk {
} }
uint32_t SetupRenderStateBlock(SpirvModule& spvModule) { uint32_t SetupRenderStateBlock(SpirvModule& spvModule, uint32_t count) {
uint32_t floatType = spvModule.defFloatType(32); uint32_t floatType = spvModule.defFloatType(32);
uint32_t vec3Type = spvModule.defVectorType(floatType, 3); uint32_t vec3Type = spvModule.defVectorType(floatType, 3);
@ -217,38 +217,38 @@ namespace dxvk {
floatType, floatType,
floatType, floatType,
}}; }};
uint32_t rsStruct = spvModule.defStructTypeUnique(rsMembers.size(), rsMembers.data()); uint32_t rsStruct = spvModule.defStructTypeUnique(count, rsMembers.data());
uint32_t rsBlock = spvModule.newVar( uint32_t rsBlock = spvModule.newVar(
spvModule.defPointerType(rsStruct, spv::StorageClassPushConstant), spvModule.defPointerType(rsStruct, spv::StorageClassPushConstant),
spv::StorageClassPushConstant); spv::StorageClassPushConstant);
spvModule.setDebugName (rsBlock, "render_state");
spvModule.setDebugName (rsStruct, "render_state_t"); spvModule.setDebugName (rsStruct, "render_state_t");
spvModule.decorate (rsStruct, spv::DecorationBlock); spvModule.decorate (rsStruct, spv::DecorationBlock);
spvModule.setDebugMemberName (rsStruct, 0, "fog_color");
spvModule.memberDecorateOffset (rsStruct, 0, offsetof(D3D9RenderStateInfo, fogColor)); uint32_t memberIdx = 0;
spvModule.setDebugMemberName (rsStruct, 1, "fog_scale"); auto SetMemberName = [&](const char* name, uint32_t offset) {
spvModule.memberDecorateOffset (rsStruct, 1, offsetof(D3D9RenderStateInfo, fogScale)); if (memberIdx >= count)
spvModule.setDebugMemberName (rsStruct, 2, "fog_end"); return;
spvModule.memberDecorateOffset (rsStruct, 2, offsetof(D3D9RenderStateInfo, fogEnd));
spvModule.setDebugMemberName (rsStruct, 3, "fog_density"); spvModule.setDebugMemberName (rsStruct, memberIdx, name);
spvModule.memberDecorateOffset (rsStruct, 3, offsetof(D3D9RenderStateInfo, fogDensity)); spvModule.memberDecorateOffset (rsStruct, memberIdx, offset);
spvModule.setDebugMemberName (rsStruct, 4, "alpha_ref"); memberIdx++;
spvModule.memberDecorateOffset (rsStruct, 4, offsetof(D3D9RenderStateInfo, alphaRef)); };
spvModule.setDebugMemberName (rsStruct, 5, "point_size");
spvModule.memberDecorateOffset (rsStruct, 5, offsetof(D3D9RenderStateInfo, pointSize)); SetMemberName("fog_color", offsetof(D3D9RenderStateInfo, fogColor));
spvModule.setDebugMemberName (rsStruct, 6, "point_size_min"); SetMemberName("fog_scale", offsetof(D3D9RenderStateInfo, fogScale));
spvModule.memberDecorateOffset (rsStruct, 6, offsetof(D3D9RenderStateInfo, pointSizeMin)); SetMemberName("fog_end", offsetof(D3D9RenderStateInfo, fogEnd));
spvModule.setDebugMemberName (rsStruct, 7, "point_size_max"); SetMemberName("fog_density", offsetof(D3D9RenderStateInfo, fogDensity));
spvModule.memberDecorateOffset (rsStruct, 7, offsetof(D3D9RenderStateInfo, pointSizeMax)); SetMemberName("alpha_ref", offsetof(D3D9RenderStateInfo, alphaRef));
spvModule.setDebugMemberName (rsStruct, 8, "point_scale_a"); SetMemberName("point_size", offsetof(D3D9RenderStateInfo, pointSize));
spvModule.memberDecorateOffset (rsStruct, 8, offsetof(D3D9RenderStateInfo, pointScaleA)); SetMemberName("point_size_min", offsetof(D3D9RenderStateInfo, pointSizeMin));
spvModule.setDebugMemberName (rsStruct, 9, "point_scale_b"); SetMemberName("point_size_max", offsetof(D3D9RenderStateInfo, pointSizeMax));
spvModule.memberDecorateOffset (rsStruct, 9, offsetof(D3D9RenderStateInfo, pointScaleB)); SetMemberName("point_scale_a", offsetof(D3D9RenderStateInfo, pointScaleA));
spvModule.setDebugMemberName (rsStruct, 10, "point_scale_c"); SetMemberName("point_scale_b", offsetof(D3D9RenderStateInfo, pointScaleB));
spvModule.memberDecorateOffset (rsStruct, 10, offsetof(D3D9RenderStateInfo, pointScaleC)); SetMemberName("point_scale_c", offsetof(D3D9RenderStateInfo, pointScaleC));
spvModule.setDebugName (rsBlock, "render_state");
return rsBlock; return rsBlock;
} }
@ -1183,16 +1183,20 @@ namespace dxvk {
void D3D9FFShaderCompiler::setupRenderStateInfo() { void D3D9FFShaderCompiler::setupRenderStateInfo() {
m_rsBlock = SetupRenderStateBlock(m_module); uint32_t count;
if (m_programType == DxsoProgramType::PixelShader) { if (m_programType == DxsoProgramType::PixelShader) {
m_interfaceSlots.pushConstOffset = 0; m_interfaceSlots.pushConstOffset = 0;
m_interfaceSlots.pushConstSize = offsetof(D3D9RenderStateInfo, pointSize); m_interfaceSlots.pushConstSize = offsetof(D3D9RenderStateInfo, pointSize);
count = 5;
} }
else { else {
m_interfaceSlots.pushConstOffset = offsetof(D3D9RenderStateInfo, pointSize); m_interfaceSlots.pushConstOffset = offsetof(D3D9RenderStateInfo, pointSize);
m_interfaceSlots.pushConstSize = sizeof(float) * 6; m_interfaceSlots.pushConstSize = sizeof(float) * 6;
count = 11;
} }
m_rsBlock = SetupRenderStateBlock(m_module, count);
} }

2
src/d3d9/d3d9_fixed_function.h
View File

@ -47,7 +47,7 @@ namespace dxvk {
uint32_t DoFixedFunctionFog(SpirvModule& spvModule, const D3D9FogContext& fogCtx); uint32_t DoFixedFunctionFog(SpirvModule& spvModule, const D3D9FogContext& fogCtx);
// Returns a render state block // Returns a render state block
uint32_t SetupRenderStateBlock(SpirvModule& spvModule); uint32_t SetupRenderStateBlock(SpirvModule& spvModule, uint32_t count);
struct D3D9PointSizeInfoVS { struct D3D9PointSizeInfoVS {
uint32_t defaultValue; uint32_t defaultValue;

7
src/dxso/dxso_compiler.cpp
View File

@ -3479,7 +3479,7 @@ void DxsoCompiler::emitControlFlowGenericLoop(
void DxsoCompiler::setupRenderStateInfo() { void DxsoCompiler::setupRenderStateInfo() {
m_rsBlock = SetupRenderStateBlock(m_module); uint32_t count;
// Only need alpha ref for PS 3. // Only need alpha ref for PS 3.
// No FF fog component. // No FF fog component.
@ -3492,12 +3492,17 @@ void DxsoCompiler::emitControlFlowGenericLoop(
m_interfaceSlots.pushConstOffset = 0; m_interfaceSlots.pushConstOffset = 0;
m_interfaceSlots.pushConstSize = offsetof(D3D9RenderStateInfo, pointSize); m_interfaceSlots.pushConstSize = offsetof(D3D9RenderStateInfo, pointSize);
} }
count = 5;
} }
else { else {
m_interfaceSlots.pushConstOffset = offsetof(D3D9RenderStateInfo, pointSize); m_interfaceSlots.pushConstOffset = offsetof(D3D9RenderStateInfo, pointSize);
// Point scale never triggers on programmable // Point scale never triggers on programmable
m_interfaceSlots.pushConstSize = sizeof(float) * 3; m_interfaceSlots.pushConstSize = sizeof(float) * 3;
count = 8;
} }
m_rsBlock = SetupRenderStateBlock(m_module, count);
} }