Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Switch
RetroArch
RetroArch
Commits
3e7328b0
Commit
3e7328b0
authored
Nov 22, 2018
by
Alfrix
Browse files
Fix shader warnings
parent
d7041f49
Changes
2
Hide whitespace changes
Inline
Side-by-side
gfx/drivers/gl_shaders/shaders_common.h
View file @
3e7328b0
...
...
@@ -23,11 +23,11 @@
"#else\n" \
" precision mediump float;\n" \
"#endif\n" #src
#define GLSL_300(src) "#version 300 es\n" #src
#else
#define CG(src) "" #src
#define GLSL(src) "" #src
#define GLSL_300(src) "#version 300 es\n" #src
#define GLSL_330(src) "#version 330 core\n" #src
#define GLSL_330(src) "#version 330\n" #src
#endif
#endif
gfx/drivers_shader/shader_glsl.c
View file @
3e7328b0
...
...
@@ -344,7 +344,6 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
}
#endif
snprintf
(
version
,
sizeof
(
version
),
"#version %u%s
\n
"
,
version_no
,
version_extra
);
RARCH_LOG
(
"[GLSL]: Using GLSL version %u%s.
\n
"
,
version_no
,
version_extra
);
}
else
if
(
glsl_core
)
{
...
...
@@ -368,9 +367,14 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
}
snprintf
(
version
,
sizeof
(
version
),
"#version %u
\n
"
,
version_no
);
RARCH_LOG
(
"[GLSL]: Using GLSL version %u.
\n
"
,
version_no
);
}
else
{
/* Don't leave version empty, prevent the compiler warning */
snprintf
(
version
,
sizeof
(
version
),
"#version 110
\n
"
);
}
RARCH_LOG
(
"[GLSL]: Using GLSL %s"
,
version
);
source
[
0
]
=
version
;
source
[
1
]
=
define
;
source
[
2
]
=
glsl
->
alias_define
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment