diff options
| -rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index d4e0f615a..691b1d106 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -132,9 +132,9 @@ void PL_U::GetSharedFontInOrderOfPriority(Kernel::HLERequestContext& ctx) { font_sizes.push_back(SHARED_FONT_REGIONS[i].size); } - ctx.WriteBuffer(font_codes.data(), font_codes.size() * sizeof(u32), 0); - ctx.WriteBuffer(font_offsets.data(), font_offsets.size() * sizeof(u32), 1); - ctx.WriteBuffer(font_sizes.data(), font_sizes.size() * sizeof(u32), 2); + ctx.WriteBuffer(font_codes, 0); + ctx.WriteBuffer(font_offsets, 1); + ctx.WriteBuffer(font_sizes, 2); rb.Push(RESULT_SUCCESS); rb.Push<u8>(static_cast<u8>(LoadState::Done)); // Fonts Loaded diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 8fdae49ef..a1ac18a71 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -216,7 +216,7 @@ public: } /// Returns a GLSL string representing the current state of the register - const std::string GetActiveString() { + std::string GetActiveString() { declr_type.insert(active_type); return GetPrefixString(active_type) + std::to_string(index) + '_' + suffix; } @@ -518,7 +518,7 @@ public: private: /// Build GLSL conversion function, e.g. floatBitsToInt, intBitsToFloat, etc. - const std::string GetGLSLConversionFunc(GLSLRegister::Type src, GLSLRegister::Type dest) const { + std::string GetGLSLConversionFunc(GLSLRegister::Type src, GLSLRegister::Type dest) const { const std::string src_type = GLSLRegister::GetTypeString(src); std::string dest_type = GLSLRegister::GetTypeString(dest); dest_type[0] = toupper(dest_type[0]); |