Menu

Commit [r7228]  Maximize  Restore  History

Some shader fixes (#56)

A couple weeks ago I merged a fix for Macs. The MacOS implementation of
glLinkShader does not allow uniforms to be passed as arguments in
functions, so I moved the uniform to a central file to be used as a
global variable. This is causing namespace collisions with another
variable in the ParticleShader files. This is a quick fix. We can come
back to it at later date.

lsong 2023-12-01

changed /G3D10/G3D-app.lib/source/ParticleSurface.cpp
changed /G3D10/data-files/shader/HeightfieldModel/HeightfieldModel_Tile_gbuffer.vrt
changed /G3D10/data-files/shader/ParticleSurface/ParticleSurface_render.geo
changed /G3D10/data-files/shader/ParticleSurface/ParticleSurface_render.pix
changed /G3D10/data-files/shader/ParticleSurface/ParticleSurface_stochasticDepthOnly.geo
changed /G3D10/data-files/shader/ParticleSurface/ParticleSurface_stochasticDepthOnly.pix
changed /G3D10/data-files/shader/UniversalMaterial/UniversalMaterial_sample.glsl
/G3D10/G3D-app.lib/source/ParticleSurface.cpp Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/HeightfieldModel/HeightfieldModel_Tile_gbuffer.vrt Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/ParticleSurface/ParticleSurface_render.geo Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/ParticleSurface/ParticleSurface_render.pix Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/ParticleSurface/ParticleSurface_stochasticDepthOnly.geo Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/ParticleSurface/ParticleSurface_stochasticDepthOnly.pix Diff Switch to side-by-side view
Loading...
/G3D10/data-files/shader/UniversalMaterial/UniversalMaterial_sample.glsl Diff Switch to side-by-side view
Loading...