Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
353907ba
Commit
353907ba
authored
13 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
SH-2908 Fix for incompatibility issue with GLSL 1.30
parent
124c5c38
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llrender/llshadermgr.cpp
+6
-2
6 additions, 2 deletions
indra/llrender/llshadermgr.cpp
with
6 additions
and
2 deletions
indra/llrender/llshadermgr.cpp
+
6
−
2
View file @
353907ba
...
@@ -640,11 +640,15 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
...
@@ -640,11 +640,15 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
//backwards compatibility with legacy texture lookup syntax
//backwards compatibility with legacy texture lookup syntax
text
[
count
++
]
=
strdup
(
"#define texture2D texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define texture2D texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define texture2DRect texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define textureCube texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define textureCube texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define texture2DLod textureLod
\n
"
);
text
[
count
++
]
=
strdup
(
"#define texture2DLod textureLod
\n
"
);
text
[
count
++
]
=
strdup
(
"#define shadow2D(a,b) vec2(texture(a,b))
\n
"
);
text
[
count
++
]
=
strdup
(
"#define shadow2D(a,b) vec2(texture(a,b))
\n
"
);
text
[
count
++
]
=
strdup
(
"#define shadow2DRect(a,b) vec2(texture(a,b))
\n
"
);
if
(
major_version
>
1
||
minor_version
>=
40
)
{
//GLSL 1.40 replaces texture2DRect et al with texture
text
[
count
++
]
=
strdup
(
"#define texture2DRect texture
\n
"
);
text
[
count
++
]
=
strdup
(
"#define shadow2DRect(a,b) vec2(texture(a,b))
\n
"
);
}
}
}
//copy preprocessor definitions into buffer
//copy preprocessor definitions into buffer
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment