Commit graph

641 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
0f8842f582 Merge pull request #7637 from zzmp/fix/tex-transfer-free
Cleanly shutdown the texture transfer thread on quit
2016-04-12 19:28:51 -07:00
samcake
0477f89b1b Justing exposing the timer correctly 2016-04-12 17:05:23 -07:00
samcake
ff1df0d45e Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
Zach Pomerantz
c72a5f3605 Exit cleanly in debug with GL logger 2016-04-11 16:32:55 -07:00
Zach Pomerantz
666bf8d42b Reset GL tex canvas while still running 2016-04-11 14:04:34 -07:00
Zach Pomerantz
1b7256d344 Clean shutdown for Texture Transfer thread 2016-04-11 12:59:53 -07:00
samcake
8a233ec9a1 the stereo rendering is working correctly, will now look for more performances 2016-04-11 12:32:59 -07:00
samcake
1138af9765 FIrst real stereo version 2016-04-11 01:19:46 -07:00
samcake
8964c2427d adding support for the 2 versions of the shaders nad solving the mapping of uniforms that arise with it 2016-04-08 18:47:21 -07:00
samcake
ef70d41cf4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-08 09:41:35 -07:00
samcake
2f8d30e7ce Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-08 09:34:55 -07:00
samcake
be178e9e09 fixing warnings 2016-04-07 23:44:28 -07:00
samcake
04e71df3bc fixing a stupid code and a warning 2016-04-07 23:05:50 -07:00
samcake
76dd740578 Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks 2016-04-07 20:05:05 -07:00
samcake
cf983e627d fixing the warnings 2016-04-06 19:36:52 -07:00
samcake
a6bac7ad92 Experimenting with a hidden gltexture object while beeing transfered 2016-04-06 18:30:18 -07:00
samcake
16174df0f3 POlishing the size evaluation and trying to debug the compression scheme 2016-04-06 16:33:45 -07:00