mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxbc] Implemented interpolation modes for pixel shader inputs

This commit is contained in:
Philip Rebohle 2017-12-08 14:56:34 +01:00
parent bd8dc20fa2
commit 8887e8b2fa
6 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dxbc/dxbc_compiler.cpp
View File

@ -102,8 +102,10 @@ namespace dxvk {
DxbcInterpolationMode im = DxbcInterpolationMode::Undefined;
if (hasInterpolationMode)
im = op.token().interpolationMode();
if (hasInterpolationMode) {
im = static_cast<DxbcInterpolationMode>(
bit::extract(ins.token().control(), 0, 3));
}
m_gen->dclInterfaceVar(
op.token().type(), regId, regDim,

11
src/dxbc/dxbc_decoder.h
View File

@ -287,17 +287,6 @@ namespace dxvk {
return DxbcComponentMask(bit::extract(m_token, 4, 5));
}
/**
* \brief Interpolatin mode
*
* Used by input declarations in pixel shaders.
* Undefined for all other instructions.
*/
DxbcInterpolationMode interpolationMode() const {
return static_cast<DxbcInterpolationMode>(
bit::extract(m_token, 11, 14));
}
/**
* \brief Operand type
*

2
src/dxbc/dxbc_enums.h
View File

@ -421,7 +421,7 @@ namespace dxvk {
Linear = 2,
LinearCentroid = 3,
LinearNoPerspective = 4,
LinearNoperspectiveCentroid = 5,
LinearNoPerspectiveCentroid = 5,
LinearSample = 6,
LinearNoPerspectiveSample = 7,
};

34
src/dxbc/gen/dxbc_gen_pixel.cpp
View File

@ -58,6 +58,40 @@ namespace dxvk {
m_module.decorateLocation(m_vRegs.at(regId).valueId, regId);
m_module.setDebugName(m_vRegs.at(regId).valueId,
str::format("v", regId).c_str());
switch (im) {
case DxbcInterpolationMode::Undefined:
Logger::err("Undefined interpolation mode");
break;
case DxbcInterpolationMode::Linear:
Logger::err("Linear interpolation mode");
break;
case DxbcInterpolationMode::Constant:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationFlat);
break;
case DxbcInterpolationMode::LinearCentroid:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationCentroid);
break;
case DxbcInterpolationMode::LinearNoPerspective:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
break;
case DxbcInterpolationMode::LinearNoPerspectiveCentroid:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationCentroid);
break;
case DxbcInterpolationMode::LinearSample:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationSample);
break;
case DxbcInterpolationMode::LinearNoPerspectiveSample:
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationNoPerspective);
m_module.decorate(m_vRegs.at(regId).valueId, spv::DecorationSample);
break;
}
}
} break;

9
src/spirv/spirv_module.cpp
View File

@ -227,6 +227,15 @@ namespace dxvk {
m_typeConstDefs.putWord(constIds[i]);
return resultId;
}
void SpirvModule::decorate(
uint32_t object,
spv::Decoration decoration) {
m_annotations.putIns (spv::OpDecorate, 3);
m_annotations.putWord (object);
m_annotations.putWord (decoration);
}
void SpirvModule::decorateBinding(

4
src/spirv/spirv_module.h
View File

@ -84,6 +84,10 @@ namespace dxvk {
uint32_t constCount,
const uint32_t* constIds);
void decorate(
uint32_t object,
spv::Decoration decoration);
void decorateBinding(
uint32_t object,
uint32_t binding);