projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
formatting
[carveJwlIkooP6JGAAIwe30JlM.git]
/
render.h
diff --git
a/render.h
b/render.h
index a00c209d2697476f2eb922ae2662ee07dcaf50c5..f97d612a37e1fa55ce54bfcdd3973a5b226c47ba 100644
(file)
--- a/
render.h
+++ b/
render.h
@@
-126,7
+126,7
@@
static void pipeline_projection( m4x4f mat, float nearz, float farz )
{
m4x4_projection( mat,
gpipeline.fov,
{
m4x4_projection( mat,
gpipeline.fov,
- (float)vg
_window_x / (float)vg_
window_y,
+ (float)vg
.window_x / (float)vg.
window_y,
nearz, farz );
}
nearz, farz );
}
@@
-184,19
+184,19
@@
static void fb_use( struct framebuffer *fb )
if( !fb )
{
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
if( !fb )
{
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
- glViewport( 0, 0, vg
_window_x, vg_
window_y );
+ glViewport( 0, 0, vg
.window_x, vg.
window_y );
}
else
{
glBindFramebuffer( GL_FRAMEBUFFER, fb->fb );
}
else
{
glBindFramebuffer( GL_FRAMEBUFFER, fb->fb );
- glViewport( 0, 0, vg
_window_x / fb->div, vg_
window_y / fb->div );
+ glViewport( 0, 0, vg
.window_x / fb->div, vg.
window_y / fb->div );
}
}
static void fb_init( struct framebuffer *fb )
{
}
}
static void fb_init( struct framebuffer *fb )
{
- i32 ix = vg
_
window_x / fb->div,
- iy = vg
_
window_y / fb->div;
+ i32 ix = vg
.
window_x / fb->div,
+ iy = vg
.
window_y / fb->div;
glGenFramebuffers( 1, &fb->fb );
glBindFramebuffer( GL_FRAMEBUFFER, fb->fb );
glGenFramebuffers( 1, &fb->fb );
glBindFramebuffer( GL_FRAMEBUFFER, fb->fb );
@@
-240,8
+240,8
@@
static void fb_resize( struct framebuffer *fb )
if( !fb->allocated )
return;
if( !fb->allocated )
return;
- i32 ix = vg
_
window_x / fb->div,
- iy = vg
_
window_y / fb->div;
+ i32 ix = vg
.
window_x / fb->div,
+ iy = vg
.
window_y / fb->div;
glBindTexture( GL_TEXTURE_2D, fb->colour );
glTexImage2D( GL_TEXTURE_2D, 0, fb->format, ix, iy, 0,
glBindTexture( GL_TEXTURE_2D, fb->colour );
glTexImage2D( GL_TEXTURE_2D, 0, fb->format, ix, iy, 0,
@@
-256,7
+256,7
@@
static void render_fb_resize(void)
if( gpipeline.ready )
{
glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
if( gpipeline.ready )
{
glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg
_window_x, vg_
window_y, 0,
+ glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg
.window_x, vg.
window_y, 0,
GL_RGB, GL_UNSIGNED_BYTE, NULL );
}
}
GL_RGB, GL_UNSIGNED_BYTE, NULL );
}
}
@@
-271,7
+271,7
@@
static void render_init_temp_buffer(void)
glGenTextures( 1, &gpipeline.rgb_background );
glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
glGenTextures( 1, &gpipeline.rgb_background );
glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg
_window_x, vg_
window_y,
+ glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg
.window_x, vg.
window_y,
0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );