Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Next
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
Miezhiko
Alchemy Next
Commits
68b6bba1
Commit
68b6bba1
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into fmt
parents
c844ebe9
5cadebd0
Branches
fmt
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llrender/llglslshader.cpp
+8
-6
8 additions, 6 deletions
indra/llrender/llglslshader.cpp
indra/llrender/llglslshader.h
+2
-2
2 additions, 2 deletions
indra/llrender/llglslshader.h
indra/llrender/llshadermgr.h
+2
-2
2 additions, 2 deletions
indra/llrender/llshadermgr.h
with
12 additions
and
10 deletions
indra/llrender/llglslshader.cpp
+
8
−
6
View file @
68b6bba1
...
...
@@ -491,12 +491,13 @@ void dumpAttachObject( const char *func_name, GLhandleARB program_object, const
}
#endif // DEBUG_SHADER_INCLUDES
BOOL
LLGLSLShader
::
attachVertexObject
(
std
::
string
object_path
)
BOOL
LLGLSLShader
::
attachVertexObject
(
std
::
string
_view
object_path
)
{
if
(
LLShaderMgr
::
instance
()
->
mVertexShaderObjects
.
count
(
object_path
)
>
0
)
auto
it
=
LLShaderMgr
::
instance
()
->
mVertexShaderObjects
.
find
(
object_path
);
if
(
it
!=
LLShaderMgr
::
instance
()
->
mVertexShaderObjects
.
end
())
{
stop_glerror
();
glAttachShader
(
mProgramObject
,
LLShaderMgr
::
instance
()
->
mVertexShaderObjects
[
object_path
]
);
glAttachShader
(
mProgramObject
,
it
->
second
);
#if DEBUG_SHADER_INCLUDES
dumpAttachObject
(
"attachVertexObject"
,
mProgramObject
,
object_path
);
#endif // DEBUG_SHADER_INCLUDES
...
...
@@ -510,12 +511,13 @@ BOOL LLGLSLShader::attachVertexObject(std::string object_path)
}
}
BOOL
LLGLSLShader
::
attachFragmentObject
(
std
::
string
object_path
)
BOOL
LLGLSLShader
::
attachFragmentObject
(
std
::
string
_view
object_path
)
{
if
(
LLShaderMgr
::
instance
()
->
mFragmentShaderObjects
.
count
(
object_path
)
>
0
)
auto
it
=
LLShaderMgr
::
instance
()
->
mFragmentShaderObjects
.
find
(
object_path
);
if
(
it
!=
LLShaderMgr
::
instance
()
->
mFragmentShaderObjects
.
end
())
{
stop_glerror
();
glAttachShader
(
mProgramObject
,
LLShaderMgr
::
instance
()
->
mFragmentShaderObjects
[
object_path
]
);
glAttachShader
(
mProgramObject
,
it
->
second
);
#if DEBUG_SHADER_INCLUDES
dumpAttachObject
(
"attachFragmentObject"
,
mProgramObject
,
object_path
);
#endif // DEBUG_SHADER_INCLUDES
...
...
This diff is collapsed.
Click to expand it.
indra/llrender/llglslshader.h
+
2
−
2
View file @
68b6bba1
...
...
@@ -111,8 +111,8 @@ class LLGLSLShader
std
::
vector
<
LLStaticHashedString
>
*
uniforms
,
U32
varying_count
=
0
,
const
char
**
varyings
=
NULL
);
BOOL
attachFragmentObject
(
std
::
string
object
);
BOOL
attachVertexObject
(
std
::
string
object
);
BOOL
attachFragmentObject
(
std
::
string
_view
object
);
BOOL
attachVertexObject
(
std
::
string
_view
object
);
void
attachObject
(
GLuint
object
);
void
attachObjects
(
GLuint
*
objects
=
NULL
,
S32
count
=
0
);
BOOL
mapAttributes
(
const
std
::
vector
<
LLStaticHashedString
>
*
attributes
);
...
...
This diff is collapsed.
Click to expand it.
indra/llrender/llshadermgr.h
+
2
−
2
View file @
68b6bba1
...
...
@@ -281,8 +281,8 @@ class LLShaderMgr
public
:
// Map of shader names to compiled
std
::
map
<
std
::
string
,
GLuint
>
mVertexShaderObjects
;
std
::
map
<
std
::
string
,
GLuint
>
mFragmentShaderObjects
;
std
::
map
<
std
::
string
,
GLuint
,
std
::
less
<>
>
mVertexShaderObjects
;
std
::
map
<
std
::
string
,
GLuint
,
std
::
less
<>
>
mFragmentShaderObjects
;
//global (reserved slot) shader parameters
std
::
vector
<
std
::
string
>
mReservedAttribs
;
...
...
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