lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OpenGL 2.1 I guess;

This commit is contained in:
bjorn 2016-07-16 13:50:44 -07:00
parent ce45850591
commit eadc31777d
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/buffer.c
View File

@ -17,7 +17,8 @@ Buffer* luax_checkbuffer(lua_State* L, int index) {
int lovrBufferDraw(lua_State* L) {
Buffer* buffer = luax_checkbuffer(L, 1);
glBindVertexArray(buffer->vao);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, buffer->data);
glDrawArrays(GL_TRIANGLES, 0, 3);
return 0;

6
src/glfw.c
View File

@ -9,10 +9,8 @@ void initGlfw(GLFWerrorfun onError, GLFWwindowclosefun onClose) {
error("Error initializing glfw");
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
// TODO make configurable
window = glfwCreateWindow(800, 600, "Window", NULL, NULL);

14
src/graphics.c
View File

@ -60,20 +60,6 @@ int lovrGraphicsNewBuffer(lua_State* L) {
buffer->data[7] = 0.5;
buffer->data[8] = 0.0;
GLuint id;
id = buffer->vbo;
glGenBuffers(1, &id);
glBindBuffer(GL_ARRAY_BUFFER, id);
glBufferData(GL_ARRAY_BUFFER, 9 * sizeof(GLfloat), buffer->data, GL_STATIC_DRAW);
id = buffer->vao;
glGenVertexArrays(1, &id);
glBindVertexArray(id);
glEnableVertexAttribArray(0);
glBindBuffer(GL_ARRAY_BUFFER, id);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
luax_pushbuffer(L, buffer);
return 1;