mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-03-22 16:20:52 +00:00
silence warnings in RSX stuff
This commit is contained in:
parent
8276d29d4f
commit
3a9ae2df9e
@ -604,7 +604,10 @@ bool is_primitive_native(rsx::primitive_type draw_mode)
|
|||||||
case rsx::primitive_type::triangle_fan:
|
case rsx::primitive_type::triangle_fan:
|
||||||
case rsx::primitive_type::quads:
|
case rsx::primitive_type::quads:
|
||||||
return false;
|
return false;
|
||||||
|
case rsx::primitive_type::invalid:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt::throw_exception("Wrong primitive type" HERE);
|
fmt::throw_exception("Wrong primitive type" HERE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -682,7 +685,11 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst,
|
|||||||
case rsx::primitive_type::triangles:
|
case rsx::primitive_type::triangles:
|
||||||
case rsx::primitive_type::triangle_strip:
|
case rsx::primitive_type::triangle_strip:
|
||||||
fmt::throw_exception("Native primitive type doesn't require expansion" HERE);
|
fmt::throw_exception("Native primitive type doesn't require expansion" HERE);
|
||||||
|
case rsx::primitive_type::invalid:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fmt::throw_exception("Tried to load invalid primitive type" HERE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -725,8 +732,9 @@ namespace
|
|||||||
return expand_indexed_triangle_fan<T>(src, dst, restart_index_enabled, restart_index);
|
return expand_indexed_triangle_fan<T>(src, dst, restart_index_enabled, restart_index);
|
||||||
case rsx::primitive_type::quads:
|
case rsx::primitive_type::quads:
|
||||||
return expand_indexed_quads<T>(src, dst, restart_index_enabled, restart_index);
|
return expand_indexed_quads<T>(src, dst, restart_index_enabled, restart_index);
|
||||||
|
default:
|
||||||
|
fmt::throw_exception("Unknown draw mode (0x%x)" HERE, (u32)draw_mode);
|
||||||
}
|
}
|
||||||
fmt::throw_exception("Unknown draw mode (0x%x)" HERE, (u32)draw_mode);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -327,7 +327,8 @@ public:
|
|||||||
for (auto& e : patch_table.db)
|
for (auto& e : patch_table.db)
|
||||||
{
|
{
|
||||||
//TODO: Use fp comparison with fabsf without hurting performance
|
//TODO: Use fp comparison with fabsf without hurting performance
|
||||||
if (patched = e.second.test_and_set(tmp[i], &dst[i]))
|
patched = e.second.test_and_set(tmp[i], &dst[i]);
|
||||||
|
if (patched)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -22,8 +22,9 @@ namespace gl
|
|||||||
case rsx::primitive_type::quads: return GL_TRIANGLES;
|
case rsx::primitive_type::quads: return GL_TRIANGLES;
|
||||||
case rsx::primitive_type::quad_strip: return GL_TRIANGLE_STRIP;
|
case rsx::primitive_type::quad_strip: return GL_TRIANGLE_STRIP;
|
||||||
case rsx::primitive_type::polygon: return GL_TRIANGLES;
|
case rsx::primitive_type::polygon: return GL_TRIANGLES;
|
||||||
|
default:
|
||||||
|
fmt::throw_exception("unknown primitive type" HERE);
|
||||||
}
|
}
|
||||||
fmt::throw_exception("unknow primitive type" HERE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@ -320,6 +321,9 @@ namespace gl
|
|||||||
case texture::internal_format::compressed_rgba_s3tc_dxt5:
|
case texture::internal_format::compressed_rgba_s3tc_dxt5:
|
||||||
compressed_image_size = ((m_width + 3) / 4) * ((m_height + 3) / 4) * 16;
|
compressed_image_size = ((m_width + 3) / 4) * ((m_height + 3) / 4) * 16;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
fmt::throw_exception("Tried to load unimplemented internal_format type." HERE);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -549,7 +553,8 @@ namespace gl
|
|||||||
case rsx::primitive_type::quads:
|
case rsx::primitive_type::quads:
|
||||||
case rsx::primitive_type::polygon:
|
case rsx::primitive_type::polygon:
|
||||||
return false;
|
return false;
|
||||||
|
default:
|
||||||
|
fmt::throw_exception("unknown primitive type" HERE);
|
||||||
}
|
}
|
||||||
fmt::throw_exception("unknown primitive type" HERE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1379,9 +1379,9 @@ namespace gl
|
|||||||
case internal_format::compressed_rgba_s3tc_dxt3:
|
case internal_format::compressed_rgba_s3tc_dxt3:
|
||||||
case internal_format::compressed_rgba_s3tc_dxt5:
|
case internal_format::compressed_rgba_s3tc_dxt5:
|
||||||
return true;
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint id() const noexcept
|
uint id() const noexcept
|
||||||
@ -1964,6 +1964,8 @@ namespace gl
|
|||||||
case texture::target::texture1D: glFramebufferTexture1D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_1D, rhs.id(), rhs.level()); break;
|
case texture::target::texture1D: glFramebufferTexture1D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_1D, rhs.id(), rhs.level()); break;
|
||||||
case texture::target::texture2D: glFramebufferTexture2D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_2D, rhs.id(), rhs.level()); break;
|
case texture::target::texture2D: glFramebufferTexture2D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_2D, rhs.id(), rhs.level()); break;
|
||||||
case texture::target::texture3D: glFramebufferTexture3D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_3D, rhs.id(), rhs.level(), 0); break;
|
case texture::target::texture3D: glFramebufferTexture3D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_3D, rhs.id(), rhs.level(), 0); break;
|
||||||
|
case texture::target::textureBuffer:
|
||||||
|
fmt::throw_exception("Tried to assign unsupported texture of type textureBuffer to fbo." HERE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2162,9 +2164,12 @@ namespace gl
|
|||||||
const GLint length = (GLint)src.length();
|
const GLint length = (GLint)src.length();
|
||||||
|
|
||||||
{
|
{
|
||||||
std::string base_name = "shaderlog/VertexProgram";
|
std::string base_name;
|
||||||
switch (shader_type)
|
switch (shader_type)
|
||||||
{
|
{
|
||||||
|
case type::vertex:
|
||||||
|
base_name = "shaderlog/VertexProgram";
|
||||||
|
break;
|
||||||
case type::fragment:
|
case type::fragment:
|
||||||
base_name = "shaderlog/FragmentProgram";
|
base_name = "shaderlog/FragmentProgram";
|
||||||
break;
|
break;
|
||||||
|
@ -134,6 +134,8 @@ namespace gl
|
|||||||
case texture::type::uint:
|
case texture::type::uint:
|
||||||
size = 4;
|
size = 4;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
LOG_ERROR(RSX, "Unsupported texture type");
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (fmt_)
|
switch (fmt_)
|
||||||
|
@ -1074,9 +1074,9 @@ namespace rsx
|
|||||||
case rsx::vertex_base_type::s32k:
|
case rsx::vertex_base_type::s32k:
|
||||||
case rsx::vertex_base_type::ub256:
|
case rsx::vertex_base_type::ub256:
|
||||||
return true;
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user