Sam Gateau
|
4ca333efe1
|
Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands
|
2015-07-16 12:38:11 -07:00 |
|
Sam Gateau
|
440464f884
|
Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile
|
2015-07-14 18:35:11 -07:00 |
|
samcake
|
99ae0326ad
|
FIxing th ecompilation issue on mac, ready to ship
|
2015-07-13 19:17:09 -07:00 |
|
Sam Gateau
|
5555ccd225
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-13 16:19:09 -07:00 |
|
Sam Gateau
|
4743bbad80
|
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
|
2015-07-13 16:18:39 -07:00 |
|
Clément Brisset
|
24eb4c8263
|
Merge pull request #5309 from sethalves/quiet-compiler
quiet compiler
|
2015-07-13 15:55:35 -07:00 |
|
Seth Alves
|
5aca0c28ef
|
quiet compiler
|
2015-07-13 07:37:59 -07:00 |
|
Seth Alves
|
fb23eb0faf
|
Merge pull request #5301 from samcake/yellow
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
|
2015-07-12 11:36:03 -07:00 |
|
Seth Alves
|
c17c9f1818
|
quiet compiler
|
2015-07-12 10:29:43 -07:00 |
|
Sam Gateau
|
6c04e6d382
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-10 11:59:31 -07:00 |
|
samcake
|
014802fd45
|
Merge pull request #5277 from venkatn93/gpuquery
GPU Query infrastructure
|
2015-07-10 11:59:08 -07:00 |
|
Niraj Venkat
|
2e5fd04d9e
|
Fix to get build working on Linux
|
2015-07-10 11:27:34 -07:00 |
|
Sam Gateau
|
2c05349b06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-10 11:10:07 -07:00 |
|
Sam Gateau
|
7fc9fd97ff
|
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
|
2015-07-10 11:03:12 -07:00 |
|
Brad Davis
|
6c5d7b8789
|
Performance optimizations in transform buffers and geometry cache
|
2015-07-09 17:53:26 -07:00 |
|
Sam Gateau
|
6b229d8d2d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-07-09 03:45:55 -07:00 |
|
Sam Gateau
|
8314fe8c7f
|
FInally getting a nice spot light volume working for all angles
|
2015-07-09 03:45:19 -07:00 |
|
Niraj Venkat
|
58f127f299
|
Fixing names of GL enums
|
2015-07-08 17:17:31 -07:00 |
|
Niraj Venkat
|
1894b42773
|
Added EXT support for Mac GL Query calls
|
2015-07-08 16:11:36 -07:00 |
|
Niraj Venkat
|
4478d76618
|
attempt #3 - fixing ubuntu build
|
2015-07-08 15:28:25 -07:00 |
|
Niraj Venkat
|
250d2e9e2c
|
attempt #2 to fix jenkins build error
|
2015-07-08 15:14:28 -07:00 |
|
Sam Gateau
|
4c44eb63da
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-08 14:25:41 -07:00 |
|
Sam Gateau
|
f992e875b4
|
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
|
2015-07-08 14:25:13 -07:00 |
|
Niraj Venkat
|
a6ec668b2e
|
attempt #1 to fix jenkins build error
|
2015-07-08 14:24:24 -07:00 |
|
Niraj Venkat
|
7e59be6196
|
First take oon the query for the gpu
|
2015-07-08 10:00:58 -07:00 |
|
samcake
|
5557dc4da2
|
clean and release the new deferredLIghtingEffect
|
2015-07-07 10:00:05 -07:00 |
|
Atlante45
|
541d9ae431
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
|
2015-07-06 18:05:43 -07:00 |
|
samcake
|
a2f6693bd7
|
getting the deferred lighting to work
|
2015-07-06 14:40:10 -07:00 |
|
Atlante45
|
d243190caf
|
Coding standard
|
2015-07-04 16:06:39 -07:00 |
|
samcake
|
4019a216d4
|
Fixed the viewport expressed in int not getting to the shader, needed to be convert to float
|
2015-07-03 12:12:54 -07:00 |
|
samcake
|
84b70fbaca
|
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
|
2015-07-03 11:36:19 -07:00 |
|
Sam Gateau
|
8d8a902328
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-02 15:06:32 -07:00 |
|
Sam Gateau
|
be8fe25338
|
Trying to finalize the look and behavior of th estatus indicators
|
2015-07-02 15:06:07 -07:00 |
|
Brad Hefta-Gaub
|
2a03f62bf2
|
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
Actions over wire and improved simulation ownership
|
2015-07-02 14:57:27 -07:00 |
|
samcake
|
b23f68107c
|
Adding the gpu_shader4 for linux and fixing function name for mac
|
2015-07-01 14:52:23 -07:00 |
|
Sam Gateau
|
2f04a9d3da
|
refining the shader pipeline and trying to pass a Status Getter from the model and fails
|
2015-07-01 07:47:46 -07:00 |
|
Sam Gateau
|
8bd5e15f73
|
Exposing the viewport to the shader and have a first draft of the draw status pipeline
|
2015-06-30 14:43:57 -07:00 |
|
Sam Gateau
|
20cb519c14
|
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
|
2015-06-30 08:19:00 -07:00 |
|
samcake
|
1b69b38835
|
fix shader issue on mac
|
2015-06-27 06:34:58 -07:00 |
|
Atlante45
|
3c49e6231e
|
Sam's fix for pipeline edge case
Basically if we bind a uniform texture and the pipeline is not setup
correctly on mac
|
2015-06-26 16:17:40 -07:00 |
|
Sam Gateau
|
f73e56a93f
|
Covering all the case for rendering the light passes
|
2015-06-26 15:45:15 -07:00 |
|
Sam Gateau
|
c41ebcae78
|
Covering all the case for rendering the light passes
|
2015-06-26 15:40:08 -07:00 |
|
Seth Alves
|
f75506bf1b
|
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
|
2015-06-22 15:37:10 -07:00 |
|
Sam Gateau
|
9994cb7540
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-22 20:00:48 +02:00 |
|
Sam Gateau
|
6444bcab1b
|
commenting out
|
2015-06-22 20:00:06 +02:00 |
|
Seth Alves
|
03a2d190b0
|
quiet valgrind
|
2015-06-22 07:18:55 -07:00 |
|
samcake
|
ca652730b5
|
REfine the gpu/Context.slh to get gpu_shader4 and gl_VertexID
|
2015-06-22 15:47:13 +02:00 |
|
Sam Gateau
|
f7ca1f608f
|
Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders
|
2015-06-22 14:06:14 +02:00 |
|
Brad Davis
|
cc6b589ae5
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-19 14:48:38 -07:00 |
|
Sam Gateau
|
5a2d2485c0
|
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
|
2015-06-19 16:30:48 +02:00 |
|