projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some errors
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
fscolour.h
diff --git
a/shaders/fscolour.h
b/shaders/fscolour.h
index 7318cac89d044434f05b4ef95c683ce35e3b3962..08fe21edb838ab280fde040862da9265845dd59f 100644
(file)
--- a/
shaders/fscolour.h
+++ b/
shaders/fscolour.h
@@
-7,6
+7,7
@@
static struct vg_shader _shader_fscolour = {
.link = shader_fscolour_link,
.vs =
{
.link = shader_fscolour_link,
.vs =
{
+.orig_file = "../../shaders/blit.vs",
.static_src =
"layout (location=0) in vec2 a_co;\n"
"out vec2 aUv;\n"
.static_src =
"layout (location=0) in vec2 a_co;\n"
"out vec2 aUv;\n"
@@
-19,6
+20,7
@@
static struct vg_shader _shader_fscolour = {
""},
.fs =
{
""},
.fs =
{
+.orig_file = "../../shaders/colour.fs",
.static_src =
"out vec4 FragColor;\n"
"uniform vec4 uColour;\n"
.static_src =
"out vec4 FragColor;\n"
"uniform vec4 uColour;\n"
@@
-34,7
+36,7
@@
static struct vg_shader _shader_fscolour = {
static GLuint _uniform_fscolour_uColour;
static void shader_fscolour_uColour(v4f v){
static GLuint _uniform_fscolour_uColour;
static void shader_fscolour_uColour(v4f v){
- glUniform4fv(
_uniform_fscolour_uColour,1,v
);
+ glUniform4fv(
_uniform_fscolour_uColour, 1, v
);
}
static void shader_fscolour_register(void){
vg_shader_register( &_shader_fscolour );
}
static void shader_fscolour_register(void){
vg_shader_register( &_shader_fscolour );