Commit graph

659 commits

Author SHA1 Message Date
Geenz
043fe3508a Add SRGBA color format. 2016-04-30 15:47:42 -04:00
Geenz
d6ee569963 Add sRGB conversions to shaders. 2016-04-25 23:52:33 -04:00
Geenz
97931d96b8 Move sRGB calcs to ColorUtils
And start consolidating any conversions with calls into ColorUtils.
2016-04-25 12:59:16 -04:00
Geenz
ed9c0dd74d Apply the correct sRGB conversions.
sRGB does not use a gamma curve of 2.2 - instead it uses a piece-wise
gamma curve that 2.2 is approximate of.  This will cause very subtle
color differences between proper sRGB and "approximate" sRGB -
differences that are noticeable nonetheless.
2016-04-25 02:35:26 -04:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request #7745 from jherico/mac_texture_fix
Fixing texture storage allocation on OSX/GL 4.1
2016-04-22 17:07:12 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red
Stereo drawcall amplification
2016-04-22 15:46:18 -07:00
Brad Davis
33ec73bfd8 PR comments 2016-04-21 15:11:11 -07:00
Brad Davis
ef466a64bf Add GPUIdent logic for determining video memory 2016-04-21 14:46:13 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
samcake
018196a070 One more review comment 2016-04-21 09:58:36 -07:00
howard-stearns
904e87313e Match the gpu adapter names gainst the vendor and renderer names used by
the ogl we're using, so that we pick the right GPU to get info from.
2016-04-20 22:57:32 -07:00
samcake
2bc8191fa6 one more comment from review 2016-04-20 18:04:11 -07:00
samcake
f2f092e9c8 Cleanup thanks to review 2016-04-20 15:42:30 -07:00
Zach Pomerantz
948af75f8a Transfer loaded resources with smart ptrs to avoid shutdown deadlock 2016-04-20 13:00:35 -07:00
Andrew Meadows
a9cfb5bf16 fix linux build 2016-04-19 18:12:35 -07:00
samcake
4c2cdc8704 A bit more clean up 2016-04-19 12:46:56 -07:00
samcake
71edae6d76 Removing the different versions of stereo drawcall to make a simple PR 2016-04-19 12:38:33 -07:00
samcake
3dad4f576e Merging with master 2016-04-19 11:59:44 -07:00
Brad Davis
882267e08f Merge pull request #7709 from samcake/blue
Introduce Shader Compilation versions
2016-04-19 11:14:22 -07:00
samcake
1a154bb3be Revert the changes to use SSAO AND 2 buffers 2016-04-19 10:47:54 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
2780ade3bd Merge pull request #7686 from zzmp/clean/bufferview
Consolidate BufferView ctors to cpp
2016-04-19 07:21:57 -07:00
samcake
7c7cd6e9e5 Go simple with a a true map for the unifrom mappings 2016-04-18 19:05:49 -07:00
samcake
4bbe0ddc6d Go simple with a a true map for the unifrom mappings 2016-04-18 19:01:15 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
samcake
c6deff16d6 Resoving to master... 2016-04-18 17:24:55 -07:00
samcake
d25a366962 Resoving to master... 2016-04-18 17:23:57 -07:00
samcake
7951284e9c Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-04-18 16:54:17 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
Seth Alves
dea748d132 Merge pull request #7683 from zzmp/clean/texture
Remove unused static method gpu::Texture
2016-04-18 10:25:53 -07:00
Brad Davis
0d3bf366c1 Support loading multiple mips in texture transfer 2016-04-17 10:22:24 -07:00
Brad Davis
ac3d6c77b9 Add default parameter to mip loaded notifications 2016-04-17 10:20:02 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
samcake
c1ed0e2e14 Enabling sbo 2016-04-15 20:02:15 -07:00
samcake
554247193c Trying SSBO for the object matrices 2016-04-15 19:55:52 -07:00
Zach Pomerantz
f2b9acd84d Rm Texture::createFromStorage 2016-04-15 16:40:05 -07:00
Zach Pomerantz
5c004e2a5c Add comment on storage texture ptr 2016-04-15 16:40:04 -07:00
Zach Pomerantz
263dcbb535 Consolidate BufferView ctors to cpp 2016-04-15 16:40:00 -07:00
samcake
fc29397d91 Clening up from review comments 2016-04-15 10:10:04 -07:00
samcake
30d0bfcfd3 FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format 2016-04-15 00:41:37 -07:00
samcake
a9fefcc802 Trying ti debug the bad normal maps 2016-04-14 18:16:14 -07:00
samcake
c6414208e8 Use the dumber version of the stereo technique and fix a warning 2016-04-14 03:25:32 -07:00
samcake
6c3e011b89 Expose cleanely the 3 different techniques 2016-04-14 02:43:28 -07:00
samcake
41d4d3b2d7 Providing a cleaner way to try different paths and exploring a simpler way 2016-04-13 19:21:17 -07:00
samcake
7653fa2c37 Fixing the resize of framebuffer to avoid reassigning the render buffer every frame 2016-04-13 10:56:29 -07:00
samcake
e4d3e848f6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-13 10:05:06 -07:00