drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/core/userland] Fix Mac build

Browse Source
This commit is contained in:
Gary Talent 2021-03-15 22:02:24 -05:00
parent 87b2963687
commit be31ad48a1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nostalgia/core/userland/gfx_opengl.cpp
View File

@ -25,7 +25,6 @@ namespace renderer {
constexpr auto TileRows = 16; constexpr auto TileRows = 16;
constexpr auto TileColumns = 16; constexpr auto TileColumns = 16;
constexpr auto TileCount = TileRows * TileColumns; constexpr auto TileCount = TileRows * TileColumns;
constexpr auto BgVertexVboRowLength = 6;
constexpr auto BgVertexVboLength = 16; constexpr auto BgVertexVboLength = 16;
constexpr auto BgVertexEboLength = 6; constexpr auto BgVertexEboLength = 6;
@ -105,7 +104,7 @@ void initBackgroundBufferObjects(GLuint shader, BackgroundBufferset *bs) {
auto texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord")); auto texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
glEnableVertexAttribArray(texCoordAttr); glEnableVertexAttribArray(texCoordAttr);
glVertexAttribPointer(texCoordAttr, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), glVertexAttribPointer(texCoordAttr, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float),
ox::bit_cast<void*>((2 * sizeof(float)))); ox::bit_cast<void*>(2 * sizeof(float)));
} }
void initBackgroundBufferset(GLuint shader, BackgroundBufferset *bufferset) { void initBackgroundBufferset(GLuint shader, BackgroundBufferset *bufferset) {

2
src/nostalgia/core/userland/glutils.hpp
View File

@ -9,7 +9,7 @@
#define GL_GLEXT_PROTOTYPES 1 #define GL_GLEXT_PROTOTYPES 1
#ifdef OX_OS_Darwin #ifdef OX_OS_Darwin
#define GL_SILENCE_DEPRECATION #define GL_SILENCE_DEPRECATION
#include <OpenGL/gl.h> #include <OpenGL/gl3.h>
#else #else
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#endif #endif