Merge pull request #1 from navewindre/windows-compat

Windows compat

1 files changed, 40 insertions, 20 deletions

diff --git a/src/render/gl_2d.cpp b/src/render/gl_2d.cpp
index 44e7e00..78af1da 100644
--- a/src/render/gl_2d.cpp
+++ b/src/render/gl_2d.cpp
@@ -1,8 +1,8 @@
 #include "gl_2d.h"
 #include "../util.h"
 
-GL_PROGRAM* gl_2d_init( GL_DATA* gl, VEC2 screensize, const char* shadername ) {
-  GL_PROGRAM* program = gl_program_create( gl, shadername );
+GL_SHADER_PROGRAM* gl_2d_init( GL_DATA* gl, VEC2 screensize, const char* shadername ) {
+  GL_SHADER_PROGRAM* program = gl_program_create( gl, shadername );
   if( !OK( gl_program_compile( gl, program ) ) )
     dlog( "gl_2d_init() : error compiling shader %s\n", shadername );
 
@@ -26,7 +26,7 @@ GL_PROGRAM* gl_2d_init( GL_DATA* gl, VEC2 screensize, const char* shadername ) {
   return program;
 }
 
-void gl_2d_line( GL_PROGRAM* gl2d, VEC2 start, VEC2 end, CLR col ) {
+void gl_2d_line( GL_SHADER_PROGRAM* gl2d, VEC2 start, VEC2 end, CLR col ) {
   static const U16 order[] = { 0, 1 };
 
   glUseProgram( gl2d->id );
@@ -49,7 +49,7 @@ void gl_2d_line( GL_PROGRAM* gl2d, VEC2 start, VEC2 end, CLR col ) {
   glDrawElements( GL_LINES, 2, GL_UNSIGNED_SHORT, order );
 }
 
-void gl_2d_rect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
+void gl_2d_rect( GL_SHADER_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
   static const U16 order[] = { 0, 1, 2, 3, 4 };
 
   glUseProgram( gl2d->id );
@@ -75,10 +75,11 @@ void gl_2d_rect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
   glDrawElements( GL_LINE_STRIP, 5, GL_UNSIGNED_SHORT, order ); 
 }
 
-void gl_2d_textured_frect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, GL_TEX2D* texture, CLR col, VEC2* uv, F32 rotation ) {
+void gl_2d_textured_frect( GL_SHADER_PROGRAM* gl2d, VEC2 origin, VEC2 dim, GL_TEX2D* texture, CLR col, VEC2* uv, F32 rotation ) {
   static const U16 order[] = { 0, 1, 2, 3 };
 
   glUseProgram( gl2d->id );
+
   VERTEX vertices[] = {
     { { origin.x,         origin.y         }, uv? uv[0] : VEC2{ 0.f, 0.f }, col, 0 },
     { { origin.x + dim.x, origin.y         }, uv? uv[1] : VEC2{ 1.f, 0.f }, col, 0 },
@@ -103,34 +104,43 @@ void gl_2d_textured_frect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, GL_TEX2D* te
 
   glBindBuffer( GL_ARRAY_BUFFER, gl2d->gl->vbuffer );
   glBufferData( GL_ARRAY_BUFFER, sizeof(vertices), &vertices[0], GL_DYNAMIC_DRAW );
+
   I32 position = glGetAttribLocation( gl2d->id, "in_pos" );
+  I32 color = glGetAttribLocation( gl2d->id, "in_col" );
+  I32 texcoord = glGetAttribLocation( gl2d->id, "in_texcoord" );
+  I32 sampler = glGetAttribLocation( gl2d->id, "in_sampler" );
+
   glEnableVertexAttribArray( position );
   glVertexAttribPointer( position, 2, GL_FLOAT, 0, sizeof(VERTEX), 0 );
-  I32 color = glGetAttribLocation( gl2d->id, "in_col" );
+
   glEnableVertexAttribArray( color );
   glVertexAttribPointer( color, 4, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->clr );
-  I32 texcoord = glGetAttribLocation( gl2d->id, "in_texcoord" );
+
   glEnableVertexAttribArray( texcoord );
   glVertexAttribPointer( texcoord, 2, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->uv );
-  I32 sampler = glGetAttribLocation( gl2d->id, "in_sampler" );
+
   glEnableVertexAttribArray( sampler );
   glVertexAttribPointer( sampler, 1, GL_UNSIGNED_BYTE, 1, sizeof(VERTEX), &( (VERTEX*)nullptr)->sampler );
 
+  glActiveTexture( GL_TEXTURE0 );
+  glBindTexture( GL_TEXTURE_2D, texture->id );
+
   glBindBuffer( GL_ARRAY_BUFFER, 0 );
 
   glActiveTexture( GL_TEXTURE0 );
   glBindTexture( GL_TEXTURE_2D, texture->id );
 
-  glUniform1f( glGetUniformLocation( gl2d->id, "in_time" ), u_time() );
+  // glUniform1f( glGetUniformLocation( gl2d->id, "in_time" ), u_time() );
 
   glDrawElements( GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, order );
   glBindTexture( GL_TEXTURE_2D, 0 );
 }
 
-void gl_2d_frect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
+void gl_2d_frect( GL_SHADER_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
   static const U16 order[] = { 0, 1, 2, 3 };
 
   glUseProgram( gl2d->id );
+  
   VERTEX vertices[] = {
     { .pos = { origin.x,         origin.y         }, .uv = { 0.f, 0.f }, .clr = col },
     { .pos = { origin.x + dim.x, origin.y         }, .uv = { 1.f, 0.f }, .clr = col },
@@ -140,21 +150,31 @@ void gl_2d_frect( GL_PROGRAM* gl2d, VEC2 origin, VEC2 dim, CLR col ) {
 
   glBindBuffer( GL_ARRAY_BUFFER, gl2d->gl->vbuffer );
   glBufferData( GL_ARRAY_BUFFER, sizeof(vertices), &vertices[0], GL_DYNAMIC_DRAW );
+  
   I32 position = glGetAttribLocation( gl2d->id, "in_pos" );
-  glEnableVertexAttribArray( position );
-  glVertexAttribPointer( position, 2, GL_FLOAT, 0, sizeof(VERTEX), 0 );
   I32 color = glGetAttribLocation( gl2d->id, "in_col" );
-  glEnableVertexAttribArray( color );
-  glVertexAttribPointer( color, 4, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->clr );
+  
+  if (position >= 0) {
+    glEnableVertexAttribArray( position );
+    glVertexAttribPointer( position, 2, GL_FLOAT, 0, sizeof(VERTEX), 0 );
+  }
+  
+  if (color >= 0) {
+    glEnableVertexAttribArray( color );
+    glVertexAttribPointer( color, 4, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->clr );
+  }
+
   I32 texcoord = glGetAttribLocation( gl2d->id, "in_texcoord" );
-  glEnableVertexAttribArray( texcoord );
-  glVertexAttribPointer( texcoord, 2, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->uv );
+  if (texcoord >= 0) {
+    glEnableVertexAttribArray( texcoord );
+    glVertexAttribPointer( texcoord, 2, GL_FLOAT, 0, sizeof(VERTEX), &( (VERTEX*)nullptr)->uv );
+  }
 
   glBindBuffer( GL_ARRAY_BUFFER, 0 );
   glDrawElements( GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, order );
 }
 
-void gl_2d_circle( GL_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res ) {
+void gl_2d_circle( GL_SHADER_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res ) {
   static U16*      order = 0;
   const  F32 step = 360.f / (F32)res;
 
@@ -195,7 +215,7 @@ void gl_2d_circle( GL_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res )
   free( vertices );
 }
 
-void gl_2d_fcircle( GL_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res ) {
+void gl_2d_fcircle( GL_SHADER_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res ) {
   static U16*      order = 0;
   const  F32 step = 360.f / (F32)res;
 
@@ -248,7 +268,7 @@ void gl_2d_fcircle( GL_PROGRAM* gl2d, VEC2 origin, F32 radius, CLR col, U32 res
   free( vertices );
 }
 
-void gl_polygon( GL_PROGRAM* gl2d, VERTEX* vertices, U32 vertices_count ) {
+void gl_polygon( GL_SHADER_PROGRAM* gl2d, VERTEX* vertices, U32 vertices_count ) {
   glUseProgram( gl2d->id );
 
   glBindBuffer( GL_ARRAY_BUFFER, gl2d->gl->vbuffer );
@@ -274,7 +294,7 @@ void gl_polygon( GL_PROGRAM* gl2d, VERTEX* vertices, U32 vertices_count ) {
 }
 
 void gl_textured_polygon(
-  GL_PROGRAM *gl2d,
+  GL_SHADER_PROGRAM *gl2d,
   VERTEX *vertices,
   U32 vertices_count,
   GL_TEX2D *tex