LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use GLSL #line preprocessor directive instead of manually trying to convert error message lines; flag shader objects for lazy-deletion after linking with program object instead of detaching them immediately (debuggers can now view source code of shader programs)

Browse Source
This commit is contained in:
Alexander Szpakowski
2012-12-28 21:32:13 -04:00
parent f54c270042
commit d62878fbb8
4 changed files with 21 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/graphics.lua
+6 -13
View File
@@ -1284,7 +1284,6 @@ do
end
local GLSL_VERT = {
HEADER_LINE_COUNT = 7,
HEADER = [[
#version 120
#define number float
@@ -1292,7 +1291,8 @@ do
#define extern uniform
#define Texel texture2D
#define VERTEX
uniform sampler2D _tex0_;]],
uniform sampler2D _tex0_;
#line 0]],
FOOTER = [[
void main() {
gl_TexCoord[0] = gl_MultiTexCoord0;
@@ -1302,7 +1302,6 @@ void main() {
}
local GLSL_FRAG = {
HEADER_LINE_COUNT = 7,
HEADER = [[
#version 120
#define number float
@@ -1310,7 +1309,8 @@ void main() {
#define extern uniform
#define Texel texture2D
#define PIXEL
uniform sampler2D _tex0_;]],
uniform sampler2D _tex0_;
#line 0]],
FOOTER = [[
void main() {
// fix weird crashing issue in OSX when _tex0_ is unused within effect()
@@ -1342,10 +1342,10 @@ void main() {
end
if vertcode then
vertcode = table.concat{GLSL_VERT.HEADER, "\n", vertcode, GLSL_VERT.FOOTER}
vertcode = table.concat({GLSL_VERT.HEADER, vertcode, GLSL_VERT.FOOTER}, "\n")
end
if fragcode then
fragcode = table.concat{GLSL_FRAG.HEADER, "\n", fragcode, GLSL_FRAG.FOOTER}
fragcode = table.concat({GLSL_FRAG.HEADER, fragcode, GLSL_FRAG.FOOTER}, "\n")
end
return vertcode, fragcode
@@ -1370,13 +1370,6 @@ void main() {
end
end
if linenumber and what and message then
local headerlinecount = 0
if shadertype == "fragment" then
headerlinecount = GLSL_FRAG.HEADER_LINE_COUNT
elseif shadertype == "vertex" then
headerlinecount = GLSL_VERT.HEADER_LINE_COUNT
end
linenumber = linenumber - headerlinecount
lines[#lines+1] = ("Line %d: %s: %s"):format(linenumber, what, message)
end
end