drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

[glutils,nostalgia,studio] Fix Xcode build errors

Browse Source
This commit is contained in:
Gary Talent
2023-06-06 00:18:13 -05:00
parent 7bccfc8a00
commit 13b2df57fe
6 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glutils/glutils.cpp
View File

@ -70,7 +70,10 @@ void bind(const FrameBuffer &fb) noexcept {
}
static ox::Result<GLShader> buildShader(GLuint shaderType, const GLchar *src, ox::CRStringView shaderName) noexcept {
static ox::Result<GLShader> buildShader(
GLuint shaderType,
const GLchar *src,
ox::CRStringView shaderName) noexcept {
GLShader shader(glCreateShader(shaderType));
glShaderSource(shader, 1, &src, nullptr);
glCompileShader(shader);
@ -99,7 +102,10 @@ ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag,
return prgm;
}
ox::Result<GLProgram> buildShaderProgram(const ox::String &vert, const ox::String &frag, const ox::String &geo) noexcept {
ox::Result<GLProgram> buildShaderProgram(
const ox::String &vert,
const ox::String &frag,
const ox::String &geo) noexcept {
return buildShaderProgram(vert.c_str(), frag.c_str(), geo.c_str());
}