Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 14:54:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45714 commits 25 branches 0 tags 1.1 GiB
Commit graph

715 commits

Author SHA1 Message Date
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
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
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
samcake
de96e34f7e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 10:00:06 -07:00
samcake
b29ef7b037 IMplementing a memory counter 2016-03-23 09:45:38 -07:00
Brad Davis
252a49eea4 Add a tracker and logging of memory allocated by the GPU library 2016-03-22 22:35:46 -07:00
samcake
24b26e3097 first few elements 2016-03-22 19:18:46 -07:00
Zach Pomerantz
64ced6ee04 Add comment explaining bare glGetError 2016-03-22 12:04:24 -07:00
samcake
9f4516da89 Working on batching the stereo 2016-03-21 09:36:16 -07:00
samcake
d05e23b278 Early work on batching stereo better 2016-03-16 18:35:07 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00
samcake
fbc19ec74f Back to the previous comuputation for the eye position in the hope to fix local lighting in stereo 2016-03-14 12:11:17 -07:00
samcake
a7f21d5fce Clena up comments, ready to PR 2016-03-14 10:36:19 -07:00
samcake
3cf32b17be Trying to fix the jittering issue, foound an extra matrix inversion that could be the source 2016-03-11 18:52:02 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
samcake
5401149713 Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial 2016-02-26 12:10:13 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -08:00
Brad Davis
ef33d297e2 Fix framebuffer behavior when changing attachments 2016-02-24 19:57:00 -08:00
samcake
9d0803e6b8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 09:33:54 -08:00
samcake
00782b0e76 GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures 2016-02-22 18:19:36 -08:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
Zach Pomerantz
791d295578 Move paint shader functions to Paint.slh 2016-02-19 11:48:44 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
samcake
7cb0108457 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 15:17:58 -08:00
Atlante45
ad215f23c6 Deactivate SSBOs for now 2016-02-01 22:41:01 +01:00
Atlante45
5ac0350993 Don't fall through in switch case 2016-02-01 18:50:01 +01:00
Atlante45
52885545ea Use feature name for ifdef 2016-02-01 18:50:01 +01:00
Atlante45
838b637591 Don't capture raw draw calls during named calls processing 2016-02-01 18:50:01 +01:00
Atlante45
a5603140de Fix for mac 2016-02-01 18:50:01 +01:00
Atlante45
8cf393bb59 Mac compatibility 2016-02-01 18:50:01 +01:00
Atlante45
8d4dab19c7 Only bind once per render batch 2016-02-01 18:50:01 +01:00
Atlante45
9e8a3f19e9 Revert max input slot changes 2016-02-01 18:50:01 +01:00
Atlante45
38a223b270 Split declareStandardTransform 2016-02-01 18:50:01 +01:00
Atlante45
71ecd1662c Add correct vertex attrib divisor 2016-02-01 18:50:01 +01:00
Atlante45
6ee88c15ec Use vbo for draw call infos 2016-02-01 18:50:01 +01:00
Atlante45
7471646569 Disable attrib vertex on normal passes 2016-02-01 18:50:01 +01:00
Atlante45
d639a838ad set currentNamedCall during setupNamedCalls 2016-02-01 18:50:01 +01:00
Atlante45
670cfc263b Capture draw call info and model xfm in batch 2016-02-01 18:50:01 +01:00
Atlante45
1658c15cca Reserve last input slot for draw call info 2016-02-01 18:50:01 +01:00
Atlante45
78cd4407db Don't pass binding manually, link named call correctly 2016-02-01 18:50:01 +01:00
Atlante45
eb55e55367 Clear buffers between each batch render 2016-02-01 18:50:01 +01:00
Atlante45
6ff38bc32f Make sure _currentDraw has correct value 2016-02-01 18:50:01 +01:00
Atlante45
3e027fc5c5 Use ssbo for model transforms 2016-02-01 18:50:01 +01:00
Atlante45
23cf72bd6c Add multi draw to factored setup 2016-02-01 18:50:01 +01:00
Atlante45
6464fabd71 Update current draw call 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
Atlante45
9e0af63441 Bind model transform as single buffer 2016-02-01 18:50:01 +01:00
Atlante45
bff2a2a8e5 Factor draw call updates 2016-02-01 18:50:01 +01:00
Atlante45
6463136240 start/stopNamedCall run in renderPassTransfer too 2016-02-01 18:50:01 +01:00
Atlante45
bd8f62504d Capture DrawCallInfo during renderPassTransfer 2016-02-01 18:50:01 +01:00
Atlante45
4d6931c5a8 Add private start/stopNamedCall batch commands 2016-02-01 18:50:01 +01:00
samcake
972d4cda77 Adding better octree visualization 2016-01-28 15:31:24 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
samcake
16573357d8 FIxing the AO results at the border of the frame by guarding the fetch out of the frame 2016-01-21 15:50:38 -08:00
Zach Pomerantz
398f83be3f Change shadow debug buffer to reuse shadowMap tex 2016-01-19 12:01:18 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
samcake
bc579f2605 Clening up the gpu::Timer behavior, now need a way to show it 2016-01-18 09:53:41 -08:00
samcake
483c28dc2d Adding gpu timer feature to actually the GPU cost of rendering 2016-01-15 19:00:18 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Zach Pomerantz
7744b89ba5 Prepare shadowMap pipeline to debug in color 2016-01-14 12:56:28 -08:00
Zach Pomerantz
e471dcc90e Fix GLBackend::do_setDepthRangeTransform by swapping hither/yon 2016-01-13 17:50:34 -08:00
Atlante45
ef5af45acd Replce GPUObjectWrapper by public const member 2016-01-13 15:01:54 -08:00
Atlante45
504939f193 Use a unique_ptr to track gpu objects 2016-01-13 14:07:48 -08:00
Atlante45
8da027c56f Encapsulate GPUObject in a safer way 2016-01-13 13:51:53 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
samcake
dbc4506cee Working on AO 2015-12-23 17:27:20 -08:00
samcake
3014b3bd5b Adding Gamma correction to all the Color coming for the attribute stream if used as color 2015-12-18 12:50:21 -08:00
Atlante45
06d7de7106 Make Shader interface take more consts 2015-12-17 15:18:23 -08:00
samcake
a60ef4fb5a Finalize the names 2015-12-15 18:32:30 -08:00
samcake
c2feec16de Cleaning the code 2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
Atlante45
b8495a6912 Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win 2015-12-11 18:05:47 -08:00
samcake
68134aafe5 Fix the broken skybox and simplify a bit the vertex shader used 2015-12-11 16:14:55 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Bradley Austin Davis
ae1345bb13 Adding nsight instrumenting to the QML render thread 2015-12-11 11:00:33 -08:00
samcake
3728a9c6f0 Merging with Master 2015-12-10 16:55:30 -08:00
Atlante45
1d513cfbba Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-09 15:09:19 -08:00
samcake
1adf2cc8ba Repesenting the collision meshes of a Model correctly 2015-12-08 16:45:12 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Brad Davis
3854523787 Fixing 32 bit build breakage 2015-12-03 09:17:41 -08:00
Brad Davis
7a05a664f4 Updating GPU for 64 bit 2015-12-02 21:34:11 -08:00
Atlante45
d08a4d77dc Shader cleanup 2015-11-24 11:51:56 -08:00
Atlante45
28c8cf26f5 Fix shader transform errors 2015-11-24 11:51:56 -08:00
Atlante45
cb14fbf4a1 Instance particle draw calls 2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1 First pass at new particle shader 2015-11-24 11:51:56 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Andrew Meadows
7fa069cf30 fix line endings grumble gruble 2015-10-20 09:38:25 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00