diff options
| author | 2018-04-16 21:23:28 -0400 | |
|---|---|---|
| committer | 2018-04-16 21:23:28 -0400 | |
| commit | 77bdc49343e3f7e51a5908245f2259dae2d86060 (patch) | |
| tree | 664653514751da1c4c92d186b06bd3e4616ae498 /src | |
| parent | gl_rasterizer: Implement indexed vertex mode. (diff) | |
| download | yuzu-77bdc49343e3f7e51a5908245f2259dae2d86060.tar.gz yuzu-77bdc49343e3f7e51a5908245f2259dae2d86060.tar.xz yuzu-77bdc49343e3f7e51a5908245f2259dae2d86060.zip | |
gl_rendering: Use NGLOG* for changed code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 309ad9af8..75b4031a7 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -151,9 +151,9 @@ void RasterizerOpenGL::SetupVertexArray(u8* array_ptr, GLintptr buffer_offset) { | |||
| 151 | // to avoid OpenGL errors. | 151 | // to avoid OpenGL errors. |
| 152 | for (unsigned index = 0; index < 16; ++index) { | 152 | for (unsigned index = 0; index < 16; ++index) { |
| 153 | auto& attrib = regs.vertex_attrib_format[index]; | 153 | auto& attrib = regs.vertex_attrib_format[index]; |
| 154 | LOG_DEBUG(HW_GPU, "vertex attrib %d, count=%d, size=%s, type=%s, offset=%d, normalize=%d", | 154 | NGLOG_DEBUG(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}", |
| 155 | index, attrib.ComponentCount(), attrib.SizeString().c_str(), | 155 | index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(), |
| 156 | attrib.TypeString().c_str(), attrib.offset.Value(), attrib.IsNormalized()); | 156 | attrib.offset.Value(), attrib.IsNormalized()); |
| 157 | 157 | ||
| 158 | glVertexAttribPointer(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib), | 158 | glVertexAttribPointer(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib), |
| 159 | attrib.IsNormalized() ? GL_TRUE : GL_FALSE, vertex_array.stride, | 159 | attrib.IsNormalized() ? GL_TRUE : GL_FALSE, vertex_array.stride, |
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index 68bb77b4d..632d14b78 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h | |||
| @@ -31,7 +31,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 31 | return GL_UNSIGNED_BYTE; | 31 | return GL_UNSIGNED_BYTE; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size=%s", attrib.SizeString().c_str()); | 34 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString()); |
| 35 | UNREACHABLE(); | 35 | UNREACHABLE(); |
| 36 | return {}; | 36 | return {}; |
| 37 | } | 37 | } |
| @@ -40,7 +40,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 40 | return GL_FLOAT; | 40 | return GL_FLOAT; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type=%s", attrib.TypeString().c_str()); | 43 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString()); |
| 44 | UNREACHABLE(); | 44 | UNREACHABLE(); |
| 45 | return {}; | 45 | return {}; |
| 46 | } | 46 | } |
| @@ -54,7 +54,7 @@ inline GLenum IndexFormat(Maxwell::IndexFormat index_format) { | |||
| 54 | case Maxwell::IndexFormat::UnsignedInt: | 54 | case Maxwell::IndexFormat::UnsignedInt: |
| 55 | return GL_UNSIGNED_INT; | 55 | return GL_UNSIGNED_INT; |
| 56 | } | 56 | } |
| 57 | LOG_CRITICAL(Render_OpenGL, "Unimplemented index_format=%d", index_format); | 57 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented index_format={}", static_cast<u32>(index_format)); |
| 58 | UNREACHABLE(); | 58 | UNREACHABLE(); |
| 59 | return {}; | 59 | return {}; |
| 60 | } | 60 | } |
| @@ -66,7 +66,7 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) { | |||
| 66 | case Maxwell::PrimitiveTopology::TriangleStrip: | 66 | case Maxwell::PrimitiveTopology::TriangleStrip: |
| 67 | return GL_TRIANGLE_STRIP; | 67 | return GL_TRIANGLE_STRIP; |
| 68 | } | 68 | } |
| 69 | LOG_CRITICAL(Render_OpenGL, "Unimplemented topology=%d", topology); | 69 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented topology={}", static_cast<u32>(topology)); |
| 70 | UNREACHABLE(); | 70 | UNREACHABLE(); |
| 71 | return {}; | 71 | return {}; |
| 72 | } | 72 | } |
| @@ -78,8 +78,8 @@ inline GLenum TextureFilterMode(Tegra::Texture::TextureFilter filter_mode) { | |||
| 78 | case Tegra::Texture::TextureFilter::Nearest: | 78 | case Tegra::Texture::TextureFilter::Nearest: |
| 79 | return GL_NEAREST; | 79 | return GL_NEAREST; |
| 80 | } | 80 | } |
| 81 | LOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode=%u", | 81 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode={}", |
| 82 | static_cast<u32>(filter_mode)); | 82 | static_cast<u32>(filter_mode)); |
| 83 | UNREACHABLE(); | 83 | UNREACHABLE(); |
| 84 | return {}; | 84 | return {}; |
| 85 | } | 85 | } |
| @@ -89,7 +89,8 @@ inline GLenum WrapMode(Tegra::Texture::WrapMode wrap_mode) { | |||
| 89 | case Tegra::Texture::WrapMode::ClampToEdge: | 89 | case Tegra::Texture::WrapMode::ClampToEdge: |
| 90 | return GL_CLAMP_TO_EDGE; | 90 | return GL_CLAMP_TO_EDGE; |
| 91 | } | 91 | } |
| 92 | LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode=%u", static_cast<u32>(wrap_mode)); | 92 | NGLOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", |
| 93 | static_cast<u32>(wrap_mode)); | ||
| 93 | UNREACHABLE(); | 94 | UNREACHABLE(); |
| 94 | return {}; | 95 | return {}; |
| 95 | } | 96 | } |