From 51b79cb399cc99601e8a94595b9a919cf01220a3 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 12 Oct 2013 03:02:39 -0700 Subject: [PATCH] Minor fixes. --- src/xenia/gpu/d3d11/d3d11_shader.cc | 4 ++-- src/xenia/gpu/ring_buffer_worker.cc | 2 +- src/xenia/gpu/shader.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xenia/gpu/d3d11/d3d11_shader.cc b/src/xenia/gpu/d3d11/d3d11_shader.cc index 2f22c779c..ebc2d4dfe 100644 --- a/src/xenia/gpu/d3d11/d3d11_shader.cc +++ b/src/xenia/gpu/d3d11/d3d11_shader.cc @@ -50,7 +50,7 @@ int D3D11VertexShader::Prepare(xe_gpu_program_cntl_t* program_cntl) { return 0; } - const void* byte_code = NULL; + void* byte_code = NULL; size_t byte_code_length = 0; // Create shader. @@ -99,7 +99,7 @@ int D3D11PixelShader::Prepare(xe_gpu_program_cntl_t* program_cntl) { return 0; } - const void* byte_code = NULL; + void* byte_code = NULL; size_t byte_code_length = 0; // Create shader. diff --git a/src/xenia/gpu/ring_buffer_worker.cc b/src/xenia/gpu/ring_buffer_worker.cc index c86c68171..4fee6da61 100644 --- a/src/xenia/gpu/ring_buffer_worker.cc +++ b/src/xenia/gpu/ring_buffer_worker.cc @@ -256,7 +256,7 @@ void RingBufferWorker::ExecuteSegment(uint32_t ptr, uint32_t length) { uint32_t d1 = XEGETUINT32BE(packet_base + 2 * 4); uint32_t index_count = d1 >> 16; uint32_t prim_type = d1 & 0x3F; - uint32_t src_sel = (d0 >> 6) & 0x3; + uint32_t src_sel = (d1 >> 6) & 0x3; XEASSERT(src_sel == 0x2); // 'SrcSel=AutoIndex' driver_->DrawAutoIndexed( (XE_GPU_PRIMITIVE_TYPE)prim_type, diff --git a/src/xenia/gpu/shader.cc b/src/xenia/gpu/shader.cc index 2f355cc35..556593d89 100644 --- a/src/xenia/gpu/shader.cc +++ b/src/xenia/gpu/shader.cc @@ -21,7 +21,7 @@ Shader::Shader( XE_GPU_SHADER_TYPE type, const uint8_t* src_ptr, size_t length, uint64_t hash) : - type_(type), hash_(hash) { + type_(type), hash_(hash), is_prepared_(false) { // Verify. dword_count_ = length / 4; XEASSERT(dword_count_ <= 512);