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 |
|
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 |
|
Brad Davis
|
882267e08f
|
Merge pull request #7709 from samcake/blue
Introduce Shader Compilation versions
|
2016-04-19 11:14:22 -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
|
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
|
7653fa2c37
|
Fixing the resize of framebuffer to avoid reassigning the render buffer every frame
|
2016-04-13 10:56:29 -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 |
|
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
|
ef70d41cf4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-04-08 09:41:35 -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 |
|
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 |
|
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
|
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 |
|