diff --git a/src/xenia/gpu/d3d12/d3d12_command_processor.cc b/src/xenia/gpu/d3d12/d3d12_command_processor.cc index 3a5550189..7e0be3cd4 100644 --- a/src/xenia/gpu/d3d12/d3d12_command_processor.cc +++ b/src/xenia/gpu/d3d12/d3d12_command_processor.cc @@ -66,16 +66,6 @@ namespace xe { namespace gpu { namespace d3d12 { -constexpr uint32_t D3D12CommandProcessor::kQueueFrames; -constexpr uint32_t - D3D12CommandProcessor::RootBindfulExtraParameterIndices::kUnavailable; -constexpr uint32_t D3D12CommandProcessor::kViewBindfulHeapSize; -constexpr uint32_t D3D12CommandProcessor::kViewBindlessHeapSize; -constexpr uint32_t D3D12CommandProcessor::kSamplerHeapSize; -constexpr uint32_t D3D12CommandProcessor::kSwapTextureWidth; -constexpr uint32_t D3D12CommandProcessor::kSwapTextureHeight; -constexpr uint32_t D3D12CommandProcessor::kScratchBufferSizeIncrement; - D3D12CommandProcessor::D3D12CommandProcessor( D3D12GraphicsSystem* graphics_system, kernel::KernelState* kernel_state) : CommandProcessor(graphics_system, kernel_state) {} diff --git a/src/xenia/gpu/d3d12/d3d12_shader.cc b/src/xenia/gpu/d3d12/d3d12_shader.cc index bdf06342b..cdef02cbf 100644 --- a/src/xenia/gpu/d3d12/d3d12_shader.cc +++ b/src/xenia/gpu/d3d12/d3d12_shader.cc @@ -20,11 +20,6 @@ namespace xe { namespace gpu { namespace d3d12 { -constexpr uint32_t D3D12Shader::kMaxTextureBindingIndexBits; -constexpr uint32_t D3D12Shader::kMaxTextureBindings; -constexpr uint32_t D3D12Shader::kMaxSamplerBindingIndexBits; -constexpr uint32_t D3D12Shader::kMaxSamplerBindings; - D3D12Shader::D3D12Shader(xenos::ShaderType shader_type, uint64_t data_hash, const uint32_t* dword_ptr, uint32_t dword_count) : Shader(shader_type, data_hash, dword_ptr, dword_count) {} diff --git a/src/xenia/gpu/d3d12/deferred_command_list.cc b/src/xenia/gpu/d3d12/deferred_command_list.cc index b177840e0..1a05f0137 100644 --- a/src/xenia/gpu/d3d12/deferred_command_list.cc +++ b/src/xenia/gpu/d3d12/deferred_command_list.cc @@ -17,8 +17,6 @@ namespace xe { namespace gpu { namespace d3d12 { -constexpr size_t DeferredCommandList::kAlignment; - DeferredCommandList::DeferredCommandList( D3D12CommandProcessor* command_processor, size_t initial_size) : command_processor_(command_processor) { diff --git a/src/xenia/gpu/d3d12/pipeline_cache.cc b/src/xenia/gpu/d3d12/pipeline_cache.cc index 346411fe6..bd0578e9b 100644 --- a/src/xenia/gpu/d3d12/pipeline_cache.cc +++ b/src/xenia/gpu/d3d12/pipeline_cache.cc @@ -61,9 +61,6 @@ namespace d3d12 { #include "xenia/gpu/d3d12/shaders/dxbc/primitive_rectangle_list_gs.h" #include "xenia/gpu/d3d12/shaders/dxbc/tessellation_vs.h" -constexpr size_t PipelineCache::kLayoutUIDEmpty; -constexpr uint32_t PipelineCache::PipelineDescription::kVersion; - PipelineCache::PipelineCache(D3D12CommandProcessor* command_processor, RegisterFile* register_file, bool bindless_resources_used, bool edram_rov_used, diff --git a/src/xenia/gpu/d3d12/primitive_converter.cc b/src/xenia/gpu/d3d12/primitive_converter.cc index 7b50f8023..2d7a6d5a6 100644 --- a/src/xenia/gpu/d3d12/primitive_converter.cc +++ b/src/xenia/gpu/d3d12/primitive_converter.cc @@ -33,13 +33,6 @@ namespace xe { namespace gpu { namespace d3d12 { -constexpr uint32_t PrimitiveConverter::kMaxNonIndexedVertices; -constexpr uint32_t PrimitiveConverter::kStaticIBTriangleFanOffset; -constexpr uint32_t PrimitiveConverter::kStaticIBTriangleFanCount; -constexpr uint32_t PrimitiveConverter::kStaticIBQuadOffset; -constexpr uint32_t PrimitiveConverter::kStaticIBQuadCount; -constexpr uint32_t PrimitiveConverter::kStaticIBTotalCount; - PrimitiveConverter::PrimitiveConverter(D3D12CommandProcessor* command_processor, RegisterFile* register_file, Memory* memory, diff --git a/src/xenia/gpu/d3d12/render_target_cache.cc b/src/xenia/gpu/d3d12/render_target_cache.cc index 20435ae8c..76b3e1feb 100644 --- a/src/xenia/gpu/d3d12/render_target_cache.cc +++ b/src/xenia/gpu/d3d12/render_target_cache.cc @@ -63,11 +63,6 @@ namespace d3d12 { #include "xenia/gpu/d3d12/shaders/dxbc/resolve_ps.h" #include "xenia/gpu/d3d12/shaders/dxbc/resolve_vs.h" -#if 0 -constexpr uint32_t RenderTargetCache::kHeap4MBPages; -#endif -constexpr uint32_t RenderTargetCache::kRenderTargetDescriptorHeapSize; - const RenderTargetCache::EDRAMLoadStoreModeInfo RenderTargetCache::edram_load_store_mode_info_[size_t( RenderTargetCache::EDRAMLoadStoreMode::kCount)] = { diff --git a/src/xenia/gpu/d3d12/shared_memory.cc b/src/xenia/gpu/d3d12/shared_memory.cc index d5a99438e..80d4c3411 100644 --- a/src/xenia/gpu/d3d12/shared_memory.cc +++ b/src/xenia/gpu/d3d12/shared_memory.cc @@ -34,15 +34,6 @@ namespace xe { namespace gpu { namespace d3d12 { -constexpr uint32_t SharedMemory::kBufferSizeLog2; -constexpr uint32_t SharedMemory::kBufferSize; -constexpr uint32_t SharedMemory::kHeapSizeLog2; -constexpr uint32_t SharedMemory::kHeapSize; -constexpr uint32_t SharedMemory::kWatchBucketSizeLog2; -constexpr uint32_t SharedMemory::kWatchBucketCount; -constexpr uint32_t SharedMemory::kWatchRangePoolSize; -constexpr uint32_t SharedMemory::kWatchNodePoolSize; - SharedMemory::SharedMemory(D3D12CommandProcessor* command_processor, Memory* memory, TraceWriter* trace_writer) : command_processor_(command_processor), diff --git a/src/xenia/gpu/d3d12/texture_cache.cc b/src/xenia/gpu/d3d12/texture_cache.cc index 2ea744838..a8229a6c6 100644 --- a/src/xenia/gpu/d3d12/texture_cache.cc +++ b/src/xenia/gpu/d3d12/texture_cache.cc @@ -101,13 +101,6 @@ namespace d3d12 { #include "xenia/gpu/d3d12/shaders/dxbc/texture_tile_r10g11b11_rgba16_cs.h" #include "xenia/gpu/d3d12/shaders/dxbc/texture_tile_r11g11b10_rgba16_cs.h" -constexpr uint32_t TextureCache::SRVDescriptorCachePage::kHeapSize; -constexpr uint32_t TextureCache::LoadConstants::kGuestPitchTiled; -constexpr uint32_t TextureCache::kScaledResolveBufferSizeLog2; -constexpr uint32_t TextureCache::kScaledResolveBufferSize; -constexpr uint32_t TextureCache::kScaledResolveHeapSizeLog2; -constexpr uint32_t TextureCache::kScaledResolveHeapSize; - // For formats with less than 4 components, assuming the last component is // replicated into the non-existent ones, similar to what is done for unused // components of operands in shaders. diff --git a/src/xenia/gpu/dxbc_shader_translator.cc b/src/xenia/gpu/dxbc_shader_translator.cc index f1446633c..0fb118650 100644 --- a/src/xenia/gpu/dxbc_shader_translator.cc +++ b/src/xenia/gpu/dxbc_shader_translator.cc @@ -62,21 +62,6 @@ using namespace ucode; // S#/T#/U# binding index, and the second is the s#/t#/u# register index // within its space. -constexpr uint32_t DxbcShaderTranslator::kMaxTextureBindingIndexBits; -constexpr uint32_t DxbcShaderTranslator::kMaxTextureBindings; -constexpr uint32_t DxbcShaderTranslator::kMaxSamplerBindingIndexBits; -constexpr uint32_t DxbcShaderTranslator::kMaxSamplerBindings; -constexpr uint32_t DxbcShaderTranslator::kInterpolatorCount; -constexpr uint32_t DxbcShaderTranslator::kPointParametersTexCoord; -constexpr uint32_t DxbcShaderTranslator::kClipSpaceZWTexCoord; -constexpr uint32_t DxbcShaderTranslator::kSwizzleXYZW; -constexpr uint32_t DxbcShaderTranslator::kSwizzleXXXX; -constexpr uint32_t DxbcShaderTranslator::kSwizzleYYYY; -constexpr uint32_t DxbcShaderTranslator::kSwizzleZZZZ; -constexpr uint32_t DxbcShaderTranslator::kSwizzleWWWW; -constexpr uint32_t DxbcShaderTranslator::kBindingIndexUnallocated; -constexpr uint32_t DxbcShaderTranslator::kCfExecBoolConstantNone; - DxbcShaderTranslator::DxbcShaderTranslator(uint32_t vendor_id, bool bindless_resources_used, bool edram_rov_used, diff --git a/src/xenia/gpu/registers.cc b/src/xenia/gpu/registers.cc index e90379823..6f0f77894 100644 --- a/src/xenia/gpu/registers.cc +++ b/src/xenia/gpu/registers.cc @@ -13,53 +13,19 @@ namespace xe { namespace gpu { namespace reg { -constexpr Register COHER_STATUS_HOST::register_index; -constexpr Register WAIT_UNTIL::register_index; - -constexpr Register SQ_PROGRAM_CNTL::register_index; -constexpr Register SQ_CONTEXT_MISC::register_index; -constexpr Register SQ_INTERPOLATOR_CNTL::register_index; - -constexpr Register VGT_DRAW_INITIATOR::register_index; -constexpr Register VGT_OUTPUT_PATH_CNTL::register_index; -constexpr Register VGT_HOS_CNTL::register_index; - -constexpr Register PA_SU_POINT_MINMAX::register_index; -constexpr Register PA_SU_POINT_SIZE::register_index; -constexpr Register PA_SU_SC_MODE_CNTL::register_index; -constexpr Register PA_SU_VTX_CNTL::register_index; -constexpr Register PA_SC_MPASS_PS_CNTL::register_index; -constexpr Register PA_SC_VIZ_QUERY::register_index; -constexpr Register PA_CL_CLIP_CNTL::register_index; -constexpr Register PA_CL_VTE_CNTL::register_index; -constexpr Register PA_SC_WINDOW_OFFSET::register_index; -constexpr Register PA_SC_WINDOW_SCISSOR_TL::register_index; -constexpr Register PA_SC_WINDOW_SCISSOR_BR::register_index; - -constexpr Register RB_MODECONTROL::register_index; -constexpr Register RB_SURFACE_INFO::register_index; -constexpr Register RB_COLORCONTROL::register_index; -constexpr Register RB_COLOR_INFO::register_index; const Register RB_COLOR_INFO::rt_register_indices[4] = { XE_GPU_REG_RB_COLOR_INFO, XE_GPU_REG_RB_COLOR1_INFO, XE_GPU_REG_RB_COLOR2_INFO, XE_GPU_REG_RB_COLOR3_INFO, }; -constexpr Register RB_COLOR_MASK::register_index; -constexpr Register RB_BLENDCONTROL::register_index; + const Register RB_BLENDCONTROL::rt_register_indices[4] = { XE_GPU_REG_RB_BLENDCONTROL0, XE_GPU_REG_RB_BLENDCONTROL1, XE_GPU_REG_RB_BLENDCONTROL2, XE_GPU_REG_RB_BLENDCONTROL3, }; -constexpr Register RB_DEPTHCONTROL::register_index; -constexpr Register RB_STENCILREFMASK::register_index; -constexpr Register RB_DEPTH_INFO::register_index; -constexpr Register RB_COPY_CONTROL::register_index; -constexpr Register RB_COPY_DEST_INFO::register_index; -constexpr Register RB_COPY_DEST_PITCH::register_index; } // namespace reg } // namespace gpu diff --git a/src/xenia/gpu/shader_translator.cc b/src/xenia/gpu/shader_translator.cc index 084e21d42..7df62db3a 100644 --- a/src/xenia/gpu/shader_translator.cc +++ b/src/xenia/gpu/shader_translator.cc @@ -42,8 +42,6 @@ using namespace ucode; // Lots of naming comes from the disassembly spit out by the XNA GS compiler // and dumps of d3dcompiler and games: https://pastebin.com/i4kAv7bB -constexpr uint32_t ShaderTranslator::kMaxMemExports; - ShaderTranslator::ShaderTranslator() = default; ShaderTranslator::~ShaderTranslator() = default; diff --git a/src/xenia/ui/d3d12/d3d12_context.cc b/src/xenia/ui/d3d12/d3d12_context.cc index 029d3c7bf..96d043941 100644 --- a/src/xenia/ui/d3d12/d3d12_context.cc +++ b/src/xenia/ui/d3d12/d3d12_context.cc @@ -26,9 +26,6 @@ namespace xe { namespace ui { namespace d3d12 { -constexpr uint32_t D3D12Context::kSwapCommandAllocatorCount; -constexpr uint32_t D3D12Context::kSwapChainBufferCount; - D3D12Context::D3D12Context(D3D12Provider* provider, Window* target_window) : GraphicsContext(provider, target_window) {} diff --git a/src/xenia/ui/d3d12/pools.cc b/src/xenia/ui/d3d12/pools.cc index 4d632763f..deff80b12 100644 --- a/src/xenia/ui/d3d12/pools.cc +++ b/src/xenia/ui/d3d12/pools.cc @@ -163,8 +163,6 @@ uint8_t* UploadBufferPool::RequestPartial( return mapping; } -constexpr uint64_t DescriptorHeapPool::kHeapIndexInvalid; - DescriptorHeapPool::DescriptorHeapPool(ID3D12Device* device, D3D12_DESCRIPTOR_HEAP_TYPE type, uint32_t page_size)