Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Johannes Braun
glare
Commits
8cf9f231
Commit
8cf9f231
authored
Jul 18, 2017
by
unknown
Browse files
Fixed stuff not working. Random seed is an int despite being a uint on CPU side
parent
1d2af4a8
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/libraries/core/base/shader_system.cpp
View file @
8cf9f231
...
...
@@ -28,7 +28,7 @@ namespace glare
{
auto
path
=
fs
::
path
(
file
);
if
(
path
.
extension
()
==
".glsl"
||
path
.
extension
()
==
".
vert
"
||
path
.
extension
()
==
".
comp
"
||
path
.
extension
()
==
".geom"
||
path
.
extension
()
==
".frag"
)
if
(
path
.
extension
()
==
".glsl"
||
path
.
extension
()
==
".
comp
"
||
path
.
extension
()
==
".
vert
"
||
path
.
extension
()
==
".geom"
||
path
.
extension
()
==
".frag"
)
{
const
auto
relative
=
files
::
relative
(
include_path
,
path
);
...
...
src/libraries/core/rendering/gbuffer.cpp
View file @
8cf9f231
...
...
@@ -67,8 +67,8 @@ namespace glare
m_texture_renderer
->
shader
().
uniformMat4
(
"u_view"
,
state
::
camera
->
getView
());
m_texture_renderer
->
shader
().
uniformMat4
(
"u_projection"
,
state
::
camera
->
getProjection
());
m_texture_renderer
->
shader
().
uniform1
u
i
(
"screen.width"
,
m_width
);
m_texture_renderer
->
shader
().
uniform1
u
i
(
"screen.height"
,
m_height
);
m_texture_renderer
->
shader
().
uniform1i
(
"screen.width"
,
m_width
);
m_texture_renderer
->
shader
().
uniform1i
(
"screen.height"
,
m_height
);
m_texture_renderer
->
shader
().
uniform1ui64
(
"u_gbuffer.depth"
,
m_gbuffer_framebuffer
->
depthAttachment
().
makeTextureResident
());
m_texture_renderer
->
shader
().
uniform1ui64
(
"u_gbuffer.diffuse"
,
m_gbuffer_framebuffer
->
colorAttachment
(
gl
::
Attachment
::
eColor0
).
makeTextureResident
());
...
...
src/libraries/raytrace/tracer/pathtracer.cpp
View file @
8cf9f231
...
...
@@ -124,9 +124,6 @@ namespace glare
m_render_shader
->
use
();
//m_render_shader->updateUniformImageRGBA32F("u_render_target", *m_render_target, gl::Access::eReadWrite);
//m_render_shader->updateUniformImageRGBA32F("u_color_store", *m_color_store, gl::Access::eReadWrite);
m_render_shader
->
uniform1ui64
(
"u_render_target"
,
m_render_target
->
makeImageResident
(
gl
::
Access
::
eReadWrite
));
m_render_shader
->
uniform1ui64
(
"u_color_store"
,
m_color_store
->
makeImageResident
(
gl
::
Access
::
eReadWrite
));
...
...
@@ -147,7 +144,7 @@ namespace glare
}
else
{
m_render_shader
->
uniform1ui64
(
"u_environment.cubemap"
,
0
);
//
m_render_shader->uniform1ui64("u_environment.cubemap", 0);
m_render_shader
->
uniform4f
(
"u_environment.color"
,
glm
::
vec4
(
0.7
f
,
0.9
f
,
0.97
f
,
1
));
m_render_shader
->
uniform1i
(
"u_environment.has"
,
0
);
}
...
...
src/libraries/raytrace/tracer/raygenerator.cpp
View file @
8cf9f231
...
...
@@ -47,7 +47,7 @@ namespace glare
m_generator_shader_default
->
uniform1ui64
(
"u_render_target"
,
pathtracer
.
renderTarget
().
makeImageResident
(
gl
::
Access
::
eReadWrite
));
m_generator_shader_default
->
storageBuffer
(
"trace_buffer"
,
pathtracer
.
traceBuffer
());
m_generator_shader_default
->
uniform1
u
i
(
"random_seed"
,
randomSeed
());
m_generator_shader_default
->
uniform1i
(
"random_seed"
,
randomSeed
());
pathtracer
.
collector
()
->
apply
(
*
m_generator_shader_default
);
...
...
@@ -113,7 +113,7 @@ namespace glare
m_buffer_depthtest
->
storageBuffer
(
"trace_buffer"
,
pathtracer
.
traceBuffer
());
pathtracer
.
collector
()
->
apply
(
*
m_buffer_depthtest
);
m_buffer_depthtest
->
uniform1
u
i
(
"random_seed"
,
randomSeed
());
m_buffer_depthtest
->
uniform1i
(
"random_seed"
,
randomSeed
());
m_buffer_depthtest
->
dispatch1d
(
m_last_width
*
m_last_height
,
1024
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment