diff options
Diffstat (limited to 'src/video_core')
| -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) {      // to avoid OpenGL errors.      for (unsigned index = 0; index < 16; ++index) {          auto& attrib = regs.vertex_attrib_format[index]; -        LOG_DEBUG(HW_GPU, "vertex attrib %d, count=%d, size=%s, type=%s, offset=%d, normalize=%d", -                  index, attrib.ComponentCount(), attrib.SizeString().c_str(), -                  attrib.TypeString().c_str(), attrib.offset.Value(), attrib.IsNormalized()); +        NGLOG_DEBUG(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}", +                    index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(), +                    attrib.offset.Value(), attrib.IsNormalized());          glVertexAttribPointer(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib),                                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) {              return GL_UNSIGNED_BYTE;          } -        LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size=%s", attrib.SizeString().c_str()); +        NGLOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString());          UNREACHABLE();          return {};      } @@ -40,7 +40,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) {          return GL_FLOAT;      } -    LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type=%s", attrib.TypeString().c_str()); +    NGLOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString());      UNREACHABLE();      return {};  } @@ -54,7 +54,7 @@ inline GLenum IndexFormat(Maxwell::IndexFormat index_format) {      case Maxwell::IndexFormat::UnsignedInt:          return GL_UNSIGNED_INT;      } -    LOG_CRITICAL(Render_OpenGL, "Unimplemented index_format=%d", index_format); +    NGLOG_CRITICAL(Render_OpenGL, "Unimplemented index_format={}", static_cast<u32>(index_format));      UNREACHABLE();      return {};  } @@ -66,7 +66,7 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {      case Maxwell::PrimitiveTopology::TriangleStrip:          return GL_TRIANGLE_STRIP;      } -    LOG_CRITICAL(Render_OpenGL, "Unimplemented topology=%d", topology); +    NGLOG_CRITICAL(Render_OpenGL, "Unimplemented topology={}", static_cast<u32>(topology));      UNREACHABLE();      return {};  } @@ -78,8 +78,8 @@ inline GLenum TextureFilterMode(Tegra::Texture::TextureFilter filter_mode) {      case Tegra::Texture::TextureFilter::Nearest:          return GL_NEAREST;      } -    LOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode=%u", -                 static_cast<u32>(filter_mode)); +    NGLOG_CRITICAL(Render_OpenGL, "Unimplemented texture filter mode={}", +                   static_cast<u32>(filter_mode));      UNREACHABLE();      return {};  } @@ -89,7 +89,8 @@ inline GLenum WrapMode(Tegra::Texture::WrapMode wrap_mode) {      case Tegra::Texture::WrapMode::ClampToEdge:          return GL_CLAMP_TO_EDGE;      } -    LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode=%u", static_cast<u32>(wrap_mode)); +    NGLOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", +                   static_cast<u32>(wrap_mode));      UNREACHABLE();      return {};  } | 
