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
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
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
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
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
ZappoMan
1dd6c1117d
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
2015-08-01 11:29:28 -07:00
Sam Gateau
6a8faca0ee
Install the GLCore way of doing input without all the legacy stuff
2015-07-31 22:46:06 -07:00
Sam Gateau
ca4dbdb996
Merging with upstream and compiling on windows
2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671
Merge branch 'master' into gl4_1
...
Conflicts:
libraries/gpu/src/gpu/Config.slh
libraries/render-utils/src/deferred_light_limited.slv
libraries/render-utils/src/simple.slf
libraries/render-utils/src/simple_textured.slf
tests/render-utils/src/main.cpp
tools/scribe/src/main.cpp
2015-07-31 15:08:37 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
samcake
fbf21cb089
FIxed the problem on Mac, by removing all of the gpuConfig includesgit status
...
q
:q
wq
2015-07-30 18:27:47 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Seth Alves
a9556660c4
fix linux build
2015-07-29 20:53:24 -07:00
samcake
70d64a7777
Really fixing the depth write mask issue on clear...
2015-07-29 18:27:10 -07:00
samcake
e32e45ed2b
make sure the writting mask is on for depth buffer
2015-07-29 18:06:46 -07:00
Sam Gateau
4972cb024f
Try to make the inlucde sequence simpler in gpu for GLBackend
2015-07-29 16:48:23 -07:00
Sam Gateau
269db0ff6f
fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes
2015-07-29 16:08:16 -07:00
