projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grind sound
[carveJwlIkooP6JGAAIwe30JlM.git]
/
render.h
diff --git
a/render.h
b/render.h
index 317b30110bc2d6df942816a258f60940871eec82..33998221b83ea206f6ee8c0d90f44d1c4abe35b3 100644
(file)
--- a/
render.h
+++ b/
render.h
@@
-6,6
+6,7
@@
#include "model.h"
#include "shaders/blit.h"
#include "model.h"
#include "shaders/blit.h"
+#include "shaders/blitblur.h"
#include "shaders/standard.h"
#include "shaders/vblend.h"
#include "shaders/standard.h"
#include "shaders/vblend.h"
@@
-281,6
+282,8
@@
VG_STATIC void render_init_temp_buffer(void)
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
gpipeline.rgb_background, 0);
glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
gpipeline.rgb_background, 0);
@@
-317,7
+320,10
@@
VG_STATIC void render_init_fs_quad(void)
vg_info( "[render] Allocate quad\n" );
float quad[] = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
vg_info( "[render] Allocate quad\n" );
float quad[] = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
- 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f };
+ 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f,
+
+ 0.2f, 0.0f, 0.8f, 1.0f, 0.2f, 1.0f,
+ 0.2f, 0.0f, 0.8f, 0.0f, 0.8f, 1.0f};
glGenVertexArrays( 1, &gpipeline.fsquad.vao );
glGenBuffers( 1, &gpipeline.fsquad.vbo );
glGenVertexArrays( 1, &gpipeline.fsquad.vao );
glGenBuffers( 1, &gpipeline.fsquad.vbo );
@@
-350,6
+356,7
@@
VG_STATIC void render_init_uniform_buffers(void)
VG_STATIC void render_init(void)
{
shader_blit_register();
VG_STATIC void render_init(void)
{
shader_blit_register();
+ shader_blitblur_register();
shader_standard_register();
shader_vblend_register();
shader_standard_register();
shader_vblend_register();
@@
-376,4
+383,10
@@
VG_STATIC void render_fsquad(void)
glDrawArrays( GL_TRIANGLES, 0, 6 );
}
glDrawArrays( GL_TRIANGLES, 0, 6 );
}
+VG_STATIC void render_fsquad1(void)
+{
+ glBindVertexArray( gpipeline.fsquad.vao );
+ glDrawArrays( GL_TRIANGLES, 6, 6 );
+}
+
#endif /* RENDER_H */
#endif /* RENDER_H */