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 |
|
Brad Davis
|
e194fc39f4
|
Move the texture transfer context back to the main thread for shutdown
|
2016-04-06 11:29:03 -07:00 |
|
samcake
|
d9bc06d92d
|
Trying to ge5t the proper behavior for the Compression texture and textures in genral...
|
2016-04-05 19:13:24 -07:00 |
|
samcake
|
710c4a1b8f
|
TRying to merge and expose counters for in flights transfers
|
2016-04-05 12:18:30 -07:00 |
|
samcake
|
71fa898654
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-04-05 09:45:45 -07:00 |
|
samcake
|
d3a87f8db2
|
need to merge, commiting at a broken state
|
2016-04-04 18:25:23 -07:00 |
|
Brad Davis
|
c168e2cc58
|
PR feedback
|
2016-04-04 16:53:30 -07:00 |
|
samcake
|
f3e6c490a4
|
merging with master, moving the TexelFOrmat function to a cpp
|
2016-04-04 12:03:37 -07:00 |
|
samcake
|
8732090073
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-04-04 11:22:21 -07:00 |
|
Brad Davis
|
d98abbc7df
|
First pass at threaded texture transfers
|
2016-04-04 10:23:01 -07:00 |
|
Brad Davis
|
667c27866e
|
Pushing texel format translation into header
|
2016-04-03 20:41:35 -07:00 |
|
samcake
|
0ba6c89c6e
|
WOrk in progress, generating several versions of the shader
|
2016-04-03 18:25:38 -07:00 |
|
samcake
|
9aface432d
|
Steping into 2 version tshaders
|
2016-04-01 19:10:14 -07:00 |
|
samcake
|
5baaad9b6e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-04-01 17:20:05 -07:00 |
|
samcake
|
64fef2cfe2
|
Updating counters correctly
|
2016-04-01 17:19:41 -07:00 |
|
samcake
|
be38de3239
|
Cleaning up the TextureMap loaders and cleaning for pr
|
2016-04-01 17:16:22 -07:00 |
|
samcake
|
582a6b7db3
|
Adding the correct mip evaluation
|
2016-04-01 01:34:33 -07:00 |
|
samcake
|
9404846ca4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-03-31 22:58:36 -07:00 |
|
samcake
|
9d1f91fa19
|
First pass at using compressed format when uploading textures
|
2016-03-31 19:27:35 -07:00 |
|
Zach Pomerantz
|
33d56d974e
|
Set texture size in cache post-proc
|
2016-03-31 17:02:40 -07:00 |
|
samcake
|
c13e24438c
|
Merge pull request #7512 from zzmp/fix/light-buf-fmt
Correctly represent lighting framebuffer
|
2016-03-30 16:10:10 -07:00 |
|
Brad Hefta-Gaub
|
84bbeef72b
|
Merge pull request #7511 from zzmp/guard/gl
Add GL checks
|
2016-03-30 15:47:16 -07:00 |
|
Zach Pomerantz
|
02273e067a
|
Add GL checks
|
2016-03-30 15:20:21 -07:00 |
|
samcake
|
6213e0859d
|
Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned
|
2016-03-30 15:07:45 -07:00 |
|
Zach Pomerantz
|
1234514e8f
|
Correctly represent light fbo fmt
|
2016-03-30 11:22:44 -07:00 |
|
Zach Pomerantz
|
6ae03fe72e
|
Sync ordering of gl fields/reset commands
|
2016-03-29 15:52:29 -07:00 |
|
samcake
|
b10e5dcdea
|
Merging back with upstream
|
2016-03-29 09:14:43 -07:00 |
|
samcake
|
b5028acde1
|
CLeaning up the location of the global variables, moved them to the gpu::COntext class as static
|
2016-03-28 11:45:07 -07:00 |
|
samcake
|
5a3896b1de
|
FIxing warnigns
|
2016-03-27 09:35:13 -07:00 |
|
samcake
|
7361304084
|
Cleaning up for review
|
2016-03-25 18:38:52 -07:00 |
|
samcake
|
9b58d50fd4
|
BUilding a more complete set of tools to monitor performances
|
2016-03-25 15:28:06 -07:00 |
|
samcake
|
9fb1a9a2a8
|
Merge and many more counters
|
2016-03-25 03:02:18 -07:00 |
|