Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
glow
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
77
Issues
77
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glow
glow
Commits
9c540247
Commit
9c540247
authored
Mar 14, 2020
by
Philip Trettner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
async tex support in new uniform syntax
parent
9d530fda
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
12 deletions
+21
-12
src/glow/fwd.hh
src/glow/fwd.hh
+14
-0
src/glow/objects/raii/UsedProgram.hh
src/glow/objects/raii/UsedProgram.hh
+5
-0
src/glow/util/AsyncTexture.hh
src/glow/util/AsyncTexture.hh
+0
-12
src/glow/util/uniform.hh
src/glow/util/uniform.hh
+2
-0
No files found.
src/glow/fwd.hh
View file @
9c540247
...
...
@@ -57,4 +57,18 @@ struct BoundShaderStorageBuffer;
struct
BoundTransformFeedback
;
struct
BoundUniformBuffer
;
struct
BoundVertexArray
;
template
<
class
TextureT
>
struct
AsyncTexture
;
using
AsyncTexture1D
=
AsyncTexture
<
Texture1D
>
;
using
AsyncTexture2D
=
AsyncTexture
<
Texture2D
>
;
using
AsyncTexture3D
=
AsyncTexture
<
Texture3D
>
;
using
AsyncTextureBuffer
=
AsyncTexture
<
TextureBuffer
>
;
using
AsyncTexture1DArray
=
AsyncTexture
<
Texture1DArray
>
;
using
AsyncTexture2DArray
=
AsyncTexture
<
Texture2DArray
>
;
using
AsyncTextureCubeMap
=
AsyncTexture
<
TextureCubeMap
>
;
using
AsyncTextureRectangle
=
AsyncTexture
<
TextureRectangle
>
;
using
AsyncTextureCubeMapArray
=
AsyncTexture
<
TextureCubeMapArray
>
;
using
AsyncTexture2DMultisample
=
AsyncTexture
<
Texture2DMultisample
>
;
using
AsyncTexture2DMultisampleArray
=
AsyncTexture
<
Texture2DMultisampleArray
>
;
}
src/glow/objects/raii/UsedProgram.hh
View file @
9c540247
...
...
@@ -162,5 +162,10 @@ void uniform_proxy::operator=(std::shared_ptr<TextureT> const& tex) &&
{
prog
.
setTexture
(
name
,
tex
);
}
template
<
class
TextureT
>
void
uniform_proxy
::
operator
=
(
AsyncTexture
<
TextureT
>
const
&
tex
)
&&
{
prog
.
setTexture
(
name
,
tex
.
texture
());
}
}
}
src/glow/util/AsyncTexture.hh
View file @
9c540247
...
...
@@ -80,16 +80,4 @@ private:
friend
class
AsyncTextureLoader
;
};
using
AsyncTexture1D
=
AsyncTexture
<
Texture1D
>
;
using
AsyncTexture2D
=
AsyncTexture
<
Texture2D
>
;
using
AsyncTexture3D
=
AsyncTexture
<
Texture3D
>
;
using
AsyncTextureBuffer
=
AsyncTexture
<
TextureBuffer
>
;
using
AsyncTexture1DArray
=
AsyncTexture
<
Texture1DArray
>
;
using
AsyncTexture2DArray
=
AsyncTexture
<
Texture2DArray
>
;
using
AsyncTextureCubeMap
=
AsyncTexture
<
TextureCubeMap
>
;
using
AsyncTextureRectangle
=
AsyncTexture
<
TextureRectangle
>
;
using
AsyncTextureCubeMapArray
=
AsyncTexture
<
TextureCubeMapArray
>
;
using
AsyncTexture2DMultisample
=
AsyncTexture
<
Texture2DMultisample
>
;
using
AsyncTexture2DMultisampleArray
=
AsyncTexture
<
Texture2DMultisampleArray
>
;
}
src/glow/util/uniform.hh
View file @
9c540247
...
...
@@ -54,6 +54,8 @@ struct uniform_proxy
void
operator
=
(
std
::
initializer_list
<
T
>
v
)
&&
;
template
<
class
TextureT
>
void
operator
=
(
std
::
shared_ptr
<
TextureT
>
const
&
tex
)
&&
;
template
<
class
TextureT
>
void
operator
=
(
AsyncTexture
<
TextureT
>
const
&
tex
)
&&
;
template
<
class
T
>
void
operator
=
(
T
const
&
)
&
{
...
...
Write
Preview
Markdown
is supported
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