ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PipelineCache: _FLOAT means use vk _SFLOAT, not _*SCALED!

This commit is contained in:
Dr. Chat 2016-07-25 12:06:50 -05:00
parent a72f1d949f
commit 19c7edddca
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xenia/gpu/vulkan/pipeline_cache.cc
View File

@ -634,6 +634,7 @@ bool PipelineCache::SetDynamicState(VkCommandBuffer command_buffer,
// https://github.com/freedreno/freedreno/blob/master/includes/a2xx.xml.h // https://github.com/freedreno/freedreno/blob/master/includes/a2xx.xml.h
// 0 = normal // 0 = normal
// 2 = point size // 2 = point size
// 7 = memexport
assert_true(program_cntl.vs_export_mode == 0 || assert_true(program_cntl.vs_export_mode == 0 ||
program_cntl.vs_export_mode == 2); program_cntl.vs_export_mode == 2);
@ -914,17 +915,16 @@ PipelineCache::UpdateStatus PipelineCache::UpdateVertexInputState(
is_signed ? VK_FORMAT_R16G16_SNORM : VK_FORMAT_R16G16_UNORM; is_signed ? VK_FORMAT_R16G16_SNORM : VK_FORMAT_R16G16_UNORM;
break; break;
case VertexFormat::k_16_16_FLOAT: case VertexFormat::k_16_16_FLOAT:
vertex_attrib_descr.format = // assert_true(is_signed);
is_signed ? VK_FORMAT_R16G16_SSCALED : VK_FORMAT_R16G16_USCALED; vertex_attrib_descr.format = VK_FORMAT_R16G16_SFLOAT;
break; break;
case VertexFormat::k_16_16_16_16: case VertexFormat::k_16_16_16_16:
vertex_attrib_descr.format = is_signed ? VK_FORMAT_R16G16B16A16_SNORM vertex_attrib_descr.format = is_signed ? VK_FORMAT_R16G16B16A16_SNORM
: VK_FORMAT_R16G16B16A16_UNORM; : VK_FORMAT_R16G16B16A16_UNORM;
break; break;
case VertexFormat::k_16_16_16_16_FLOAT: case VertexFormat::k_16_16_16_16_FLOAT:
vertex_attrib_descr.format = is_signed // assert_true(is_signed);
? VK_FORMAT_R16G16B16A16_SSCALED vertex_attrib_descr.format = VK_FORMAT_R16G16B16A16_SFLOAT;
: VK_FORMAT_R16G16B16A16_USCALED;
break; break;
case VertexFormat::k_32: case VertexFormat::k_32:
vertex_attrib_descr.format = vertex_attrib_descr.format =
@ -1290,15 +1290,6 @@ PipelineCache::UpdateStatus PipelineCache::UpdateColorBlendState() {
auto& regs = update_color_blend_state_regs_; auto& regs = update_color_blend_state_regs_;
auto& state_info = update_color_blend_state_info_; auto& state_info = update_color_blend_state_info_;
// Alpha testing -- ALPHAREF, ALPHAFUNC, ALPHATESTENABLE
// Deprecated in GL, implemented in shader.
// if(ALPHATESTENABLE && frag_out.a [<=/ALPHAFUNC] ALPHAREF) discard;
// uint32_t color_control = reg_file[XE_GPU_REG_RB_COLORCONTROL].u32;
// draw_batcher_.set_alpha_test((color_control & 0x4) != 0, //
// ALPAHTESTENABLE
// color_control & 0x7, // ALPHAFUNC
// reg_file[XE_GPU_REG_RB_ALPHA_REF].f32);
bool dirty = false; bool dirty = false;
dirty |= SetShadowRegister(&regs.rb_colorcontrol, XE_GPU_REG_RB_COLORCONTROL); dirty |= SetShadowRegister(&regs.rb_colorcontrol, XE_GPU_REG_RB_COLORCONTROL);
dirty |= SetShadowRegister(&regs.rb_color_mask, XE_GPU_REG_RB_COLOR_MASK); dirty |= SetShadowRegister(&regs.rb_color_mask, XE_GPU_REG_RB_COLOR_MASK);