merge con los cambios de rafa

diff --git a/dl_init.h b/dl_init.h
index c461fd8bb0059adce0063557ff6c5f2becc472d8..1db01d37106772c1bd11762ebd7f604161aa1b5f 100644 (file)
--- a/dl_init.h
+++ b/dl_init.h
@@ -46,7 +46,6 @@ typedef struct
        //void  (*glPushMatrix)(void);
        //void  (*glPopMatrix)(void);
        //void  (*glTexCoord2f)(GLfloat, GLfloat);
-       void    (*glBindTexture)(GLenum, GLuint);
        void    (*glRecti)(GLint, GLint, GLint, GLint);
        void    (*glClearColor)(GLfloat, GLfloat, GLfloat, GLfloat);
        //void    (*glXUseXFont)(Font, int, int, int);

diff --git a/main.c b/main.c
index 2857f559b7f7b3c9f226fc1f0a9420812ce3aa9a..0f25cad338488e39d691f6c08a27160bcab5ec22 100644 (file)
--- a/main.c
+++ b/main.c
@@ -49,7 +49,7 @@ void initModels()
 
 void endRenderTexture() 
 {
-       fn.glBindTexture(renderTexture);
+       fn.glBindTexture(GL_TEXTURE_2D, renderTexture);
        fn.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 }
 
@@ -92,7 +92,6 @@ void __attribute__((externally_visible)) _start(void)
                fn.SDL_PollEvent(&event);
        } while(event.type != SDL_KEYDOWN);
 
-end:
        fn.SDL_Quit();
 
 #if 1