rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-02 13:29:14 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Moved all operators in dxbc_names to dxvk namespace (#296)

Browse Source
This commit is contained in:
Vesim 2018-04-17 17:33:07 +02:00 committed by Philip Rebohle
parent 9a8263f465
commit b82ae16f8a
2 changed files with 432 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/dxbc/dxbc_names.cpp
View File

@ -1,8 +1,8 @@
#include "dxbc_names.h" #include "dxbc_names.h"
using namespace dxvk; namespace dxvk {
std::ostream& operator << (std::ostream& os, DxbcOpcode e) { std::ostream& operator << (std::ostream& os, DxbcOpcode e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcOpcode::Add); ENUM_NAME(DxbcOpcode::Add);
ENUM_NAME(DxbcOpcode::And); ENUM_NAME(DxbcOpcode::And);
@ -213,10 +213,10 @@ std::ostream& operator << (std::ostream& os, DxbcOpcode e) {
ENUM_NAME(DxbcOpcode::DclGsInstanceCount); ENUM_NAME(DxbcOpcode::DclGsInstanceCount);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcExtOpcode e) { std::ostream& operator << (std::ostream& os, DxbcExtOpcode e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcExtOpcode::Empty); ENUM_NAME(DxbcExtOpcode::Empty);
ENUM_NAME(DxbcExtOpcode::SampleControls); ENUM_NAME(DxbcExtOpcode::SampleControls);
@ -224,10 +224,10 @@ std::ostream& operator << (std::ostream& os, DxbcExtOpcode e) {
ENUM_NAME(DxbcExtOpcode::ResourceReturnType); ENUM_NAME(DxbcExtOpcode::ResourceReturnType);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcOperandType e) { std::ostream& operator << (std::ostream& os, DxbcOperandType e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcOperandType::Temp); ENUM_NAME(DxbcOperandType::Temp);
ENUM_NAME(DxbcOperandType::Input); ENUM_NAME(DxbcOperandType::Input);
@ -272,38 +272,38 @@ std::ostream& operator << (std::ostream& os, DxbcOperandType e) {
ENUM_NAME(DxbcOperandType::CycleCounter); ENUM_NAME(DxbcOperandType::CycleCounter);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, dxvk::DxbcOperandExt e) { std::ostream& operator << (std::ostream& os, dxvk::DxbcOperandExt e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcOperandExt::OperandModifier); ENUM_NAME(DxbcOperandExt::OperandModifier);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcComponentCount e) { std::ostream& operator << (std::ostream& os, DxbcComponentCount e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcComponentCount::Component0); ENUM_NAME(DxbcComponentCount::Component0);
ENUM_NAME(DxbcComponentCount::Component1); ENUM_NAME(DxbcComponentCount::Component1);
ENUM_NAME(DxbcComponentCount::Component4); ENUM_NAME(DxbcComponentCount::Component4);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcRegMode e) { std::ostream& operator << (std::ostream& os, DxbcRegMode e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcRegMode::Mask); ENUM_NAME(DxbcRegMode::Mask);
ENUM_NAME(DxbcRegMode::Swizzle); ENUM_NAME(DxbcRegMode::Swizzle);
ENUM_NAME(DxbcRegMode::Select1); ENUM_NAME(DxbcRegMode::Select1);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcOperandIndexRepresentation e) { std::ostream& operator << (std::ostream& os, DxbcOperandIndexRepresentation e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcOperandIndexRepresentation::Imm32); ENUM_NAME(DxbcOperandIndexRepresentation::Imm32);
ENUM_NAME(DxbcOperandIndexRepresentation::Imm64); ENUM_NAME(DxbcOperandIndexRepresentation::Imm64);
@ -312,10 +312,10 @@ std::ostream& operator << (std::ostream& os, DxbcOperandIndexRepresentation e) {
ENUM_NAME(DxbcOperandIndexRepresentation::Imm64Relative); ENUM_NAME(DxbcOperandIndexRepresentation::Imm64Relative);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcResourceDim e) { std::ostream& operator << (std::ostream& os, DxbcResourceDim e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcResourceDim::Unknown); ENUM_NAME(DxbcResourceDim::Unknown);
ENUM_NAME(DxbcResourceDim::Buffer); ENUM_NAME(DxbcResourceDim::Buffer);
@ -332,10 +332,10 @@ std::ostream& operator << (std::ostream& os, DxbcResourceDim e) {
ENUM_NAME(DxbcResourceDim::StructuredBuffer); ENUM_NAME(DxbcResourceDim::StructuredBuffer);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcResourceReturnType e) { std::ostream& operator << (std::ostream& os, DxbcResourceReturnType e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcResourceReturnType::Unorm); ENUM_NAME(DxbcResourceReturnType::Unorm);
ENUM_NAME(DxbcResourceReturnType::Snorm); ENUM_NAME(DxbcResourceReturnType::Snorm);
@ -348,10 +348,10 @@ std::ostream& operator << (std::ostream& os, DxbcResourceReturnType e) {
ENUM_NAME(DxbcResourceReturnType::Unused); ENUM_NAME(DxbcResourceReturnType::Unused);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcRegisterComponentType e) { std::ostream& operator << (std::ostream& os, DxbcRegisterComponentType e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcRegisterComponentType::Unknown); ENUM_NAME(DxbcRegisterComponentType::Unknown);
ENUM_NAME(DxbcRegisterComponentType::Uint32); ENUM_NAME(DxbcRegisterComponentType::Uint32);
@ -359,19 +359,19 @@ std::ostream& operator << (std::ostream& os, DxbcRegisterComponentType e) {
ENUM_NAME(DxbcRegisterComponentType::Float32); ENUM_NAME(DxbcRegisterComponentType::Float32);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcInstructionReturnType e) { std::ostream& operator << (std::ostream& os, DxbcInstructionReturnType e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcInstructionReturnType::Float); ENUM_NAME(DxbcInstructionReturnType::Float);
ENUM_NAME(DxbcInstructionReturnType::Uint); ENUM_NAME(DxbcInstructionReturnType::Uint);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, DxbcSystemValue e) { std::ostream& operator << (std::ostream& os, DxbcSystemValue e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcSystemValue::None); ENUM_NAME(DxbcSystemValue::None);
ENUM_NAME(DxbcSystemValue::Position); ENUM_NAME(DxbcSystemValue::Position);
@ -403,10 +403,10 @@ std::ostream& operator << (std::ostream& os, DxbcSystemValue e) {
ENUM_NAME(DxbcSystemValue::DepthLe); ENUM_NAME(DxbcSystemValue::DepthLe);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, dxvk::DxbcProgramType e) { std::ostream& operator << (std::ostream& os, dxvk::DxbcProgramType e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcProgramType::PixelShader); ENUM_NAME(DxbcProgramType::PixelShader);
ENUM_NAME(DxbcProgramType::VertexShader); ENUM_NAME(DxbcProgramType::VertexShader);
@ -416,9 +416,9 @@ std::ostream& operator << (std::ostream& os, dxvk::DxbcProgramType e) {
ENUM_NAME(DxbcProgramType::ComputeShader); ENUM_NAME(DxbcProgramType::ComputeShader);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
std::ostream& operator << (std::ostream& os, dxvk::DxbcCustomDataClass e) { std::ostream& operator << (std::ostream& os, dxvk::DxbcCustomDataClass e) {
switch (e) { switch (e) {
ENUM_NAME(DxbcCustomDataClass::Comment); ENUM_NAME(DxbcCustomDataClass::Comment);
ENUM_NAME(DxbcCustomDataClass::DebugInfo); ENUM_NAME(DxbcCustomDataClass::DebugInfo);
@ -426,4 +426,6 @@ std::ostream& operator << (std::ostream& os, dxvk::DxbcCustomDataClass e) {
ENUM_NAME(DxbcCustomDataClass::ImmConstBuf); ENUM_NAME(DxbcCustomDataClass::ImmConstBuf);
ENUM_DEFAULT(e); ENUM_DEFAULT(e);
} }
} }
} //namespace dxvk

32
src/dxbc/dxbc_names.h
View File

@ -5,17 +5,21 @@
#include "dxbc_common.h" #include "dxbc_common.h"
#include "dxbc_enums.h" #include "dxbc_enums.h"
std::ostream& operator << (std::ostream& os, dxvk::DxbcOpcode e); namespace dxvk {
std::ostream& operator << (std::ostream& os, dxvk::DxbcExtOpcode e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcOperandType e); std::ostream& operator << (std::ostream& os, DxbcOpcode e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcOperandExt e); std::ostream& operator << (std::ostream& os, DxbcExtOpcode e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcComponentCount e); std::ostream& operator << (std::ostream& os, DxbcOperandType e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcRegMode e); std::ostream& operator << (std::ostream& os, DxbcOperandExt e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcOperandIndexRepresentation e); std::ostream& operator << (std::ostream& os, DxbcComponentCount e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcResourceDim e); std::ostream& operator << (std::ostream& os, DxbcRegMode e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcResourceReturnType e); std::ostream& operator << (std::ostream& os, DxbcOperandIndexRepresentation e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcRegisterComponentType e); std::ostream& operator << (std::ostream& os, DxbcResourceDim e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcInstructionReturnType e); std::ostream& operator << (std::ostream& os, DxbcResourceReturnType e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcSystemValue e); std::ostream& operator << (std::ostream& os, DxbcRegisterComponentType e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcProgramType e); std::ostream& operator << (std::ostream& os, DxbcInstructionReturnType e);
std::ostream& operator << (std::ostream& os, dxvk::DxbcCustomDataClass e); std::ostream& operator << (std::ostream& os, DxbcSystemValue e);
std::ostream& operator << (std::ostream& os, DxbcProgramType e);
std::ostream& operator << (std::ostream& os, DxbcCustomDataClass e);
} // namespace dxvk