Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
samcake
fda9827100
Merge pull request #5529 from SeijiEmery/gputest
...
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Seiji Emery
6b5fb60fcf
Merge remote-tracking branch 'highfidelity/master' into gputest
2015-08-19 11:24:15 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Anthony J. Thibault
cd58f012a3
Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
...
Fixed incorrect size for camera transform uniforms passed via
glBindBufferRange. This is a legitimate bug on our side.
I guess Intel and nVidia drivers just happen to ignore this field.
This was likely causing many of the shader TransformCamera members
to be identity or un-initialized, specifically, the projection
matrix values.
This was resulting in a black screen on ATI gpus.
2015-08-15 09:42:05 -07:00
Brad Davis
f539e95e53
Fixing includes
2015-08-11 12:02:40 -07:00
Bradley Austin Davis
e94cff594d
Working on breaking up transfers and draws
2015-08-11 12:02:39 -07:00
Seth Alves
fedbfe8881
fix jumbled merge
2015-08-11 11:00:04 -07:00
Seth Alves
804c1ecf8e
quiet compiler
2015-08-11 10:46:53 -07:00
Seth Alves
dab5848330
quiet compiler
2015-08-11 10:21:30 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Seiji Emery
5ca8d20251
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
...
Conflicts:
cmake/modules/Find3DConnexionClient.cmake
interface/external/connexionclient/readme.txt
interface/src/devices/3DConnexionClient.cpp
interface/src/devices/3DConnexionClient.h
2015-08-05 15:56:06 -07:00
Stephen Birarda
998a8168a3
remove an extra unneeded message
2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7
resolve conflicts on merge with upstream/core
2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb
repairs for build type of glew external
2015-08-05 14:30:36 -07:00
Bradley Austin Davis
89cc2ccfa5
More merge comments
2015-08-05 13:53:19 -07:00
Bradley Austin Davis
649b9d6ce9
Fixing signed/unsigned comparisons
2015-08-05 13:48:05 -07:00
Stephen Birarda
cc909507f4
get GLEW for all platforms as external project
2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a
Removing integrated glew
2015-08-05 11:21:59 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
Seiji Emery
e5cb9cb862
integrating core-profile work to get opengl 4.1 on mac
2015-08-04 15:18:47 -07:00
Sam Gateau
10fcce7064
FIx again the issue of the COlor 32 format to NUINT8
2015-08-04 14:38:43 -07:00
Sam Gateau
34183b9ddf
COmmenting the remove of the glLIneWidth and demoving dead code
2015-08-04 12:36:35 -07:00
Sam Gateau
d07ab353fc
remove glLineWidth completely because it s not available anymore for wide lines in core
2015-08-04 11:57:20 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Sam Gateau
44e7223547
Fixing the skinning by simply reverting the change to the format for the inSkinIndex
2015-08-03 16:05:04 -07:00
samcake
caa5732e06
Remove completely GL transform legacy support
2015-08-03 14:51:57 -07:00
Sam Gateau
647abe5009
Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead
2015-08-03 13:41:02 -07:00
Sam Gateau
f23df03ea9
REsolve the bracket issue,
2015-08-03 13:10:06 -07:00
samcake
32c253453b
REsolving the input
2015-08-03 12:47:51 -07:00
Seiji Emery
4e3cfd7c49
clear empty frame buffer fix
...
thanks sam!
2015-08-03 12:04:02 -07:00
samcake
d3fc05e99f
FIxed a few shaders varyings, problem identified on MAC to be solved
2015-08-03 11:18:08 -07:00
Sam Gateau
785fd03085
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
2015-08-03 10:26:06 -07:00
samcake
85077604dc
Merge pull request #5478 from jherico/marge
...
CORE BRANCH - More shader fixes
2015-08-03 10:25:33 -07:00
Sam Gateau
1a276924f0
Merging core
2015-08-03 10:05:23 -07:00
Brad Davis
5c07a7d85b
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-01 21:58:05 -07:00
Brad Davis
53feaf2ab6
More shader fixes
2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Brad Davis
180f912924
Merge remote-tracking branch 'upstream/master' into core
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/gpu/src/gpu/Format.h
libraries/render-utils/src/GeometryCache.cpp
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/text/Font.cpp
2015-08-01 20:01:59 -07:00
ZappoMan
493836e363
remove QUADS from GLBackendShared and Format
2015-08-01 17:26:38 -07:00
