samcake
|
b9102204ea
|
FIx the filtering problem on color and normals introduced since we generate mips with QImage
|
2017-02-10 11:40:39 -08:00 |
|
samcake
|
e11d10f5d4
|
Reparing broken normals and also fixing the ambient lighting bug
|
2017-02-08 16:56:59 -08:00 |
|
samcake
|
267d553c26
|
Cleaning comments and pixel format assignments
|
2017-02-08 11:42:23 -08:00 |
|
samcake
|
a137659a35
|
Cleaning up pr for simpler merge
|
2017-02-08 11:13:55 -08:00 |
|
samcake
|
7b49f548ed
|
trying to remove the 24bits formats
|
2017-02-07 18:06:49 -08:00 |
|
samcake
|
feb36b8dbf
|
Merge branch 'purple' of https://github.com/samcake/hifi into blue
|
2017-02-06 11:56:45 -08:00 |
|
samcake
|
9fd1d5114c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
|
2017-02-06 10:16:41 -08:00 |
|
samcake
|
c864e57855
|
first pass on a working image class and the mip generation
|
2017-02-06 08:51:04 -08:00 |
|
samcake
|
e8cdee71ed
|
avoid assertion on mac
|
2017-02-03 22:49:41 -08:00 |
|
samcake
|
27dab5c4ba
|
COmbining more intrumentation, mip generation on cpu and an improved blit for the derez case
|
2017-02-03 12:03:59 -08:00 |
|
sam
|
c4ec0cc069
|
fixing a bad cDebug
|
2017-02-02 22:09:52 -08:00 |
|
samcake
|
b440ccad28
|
Improving the IMage class
|
2017-02-02 17:53:48 -08:00 |
|
samcake
|
446aaf3bce
|
Turn off cpu mip map to add instrumentation to master
|
2017-02-02 11:58:02 -08:00 |
|
sam
|
569378bdeb
|
REcompiling for windows...
|
2017-02-02 01:57:43 -08:00 |
|
sam
|
387621e586
|
Merge branch 'blue' of https://github.com/samcake/hifi into purple
|
2017-02-01 22:01:39 -08:00 |
|
sam
|
3aa239b004
|
More instrumentation during texture load
|
2017-02-01 22:00:03 -08:00 |
|
samcake
|
3108360094
|
Merge branch 'blue' of https://github.com/samcake/hifi into purple
|
2017-02-01 16:36:40 -08:00 |
|
samcake
|
6bdf50f2db
|
moving mip map gen to cpu
|
2017-02-01 15:16:37 -08:00 |
|
samcake
|
edcba1b7c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
|
2017-02-01 10:12:47 -08:00 |
|
samcake
|
586db3405a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
|
2017-01-30 22:08:51 -08:00 |
|
Brad Hefta-Gaub
|
dbbed462b4
|
cleanup naked qDebug() calls
|
2016-12-19 22:24:25 -08:00 |
|
Brad Davis
|
30a9961362
|
tracing polish
|
2016-12-16 14:02:27 -08:00 |
|
Ryan Huffman
|
7bb2755913
|
Add chrome tracing support
|
2016-12-16 01:14:01 -08:00 |
|
samcake
|
982664dac5
|
Merging with upstream
|
2016-11-15 18:14:25 -08:00 |
|
samcake
|
1c61664ca0
|
Still refining th edesign of th eiMage classes
|
2016-11-13 23:20:39 -08:00 |
|
samcake
|
41109553eb
|
Saving state before merge up
|
2016-11-04 22:56:18 -07:00 |
|
samcake
|
6926cd274c
|
Merge with upstream
|
2016-11-02 18:15:08 -07:00 |
|
samcake
|
b38f69dc78
|
stage 0 of fooling around with image compression....
|
2016-10-29 22:43:42 -07:00 |
|
samcake
|
9adbb42a6c
|
Fixing the skybox, still issues with the lights
|
2016-10-28 18:12:39 -07:00 |
|
samcake
|
c65269e72d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
|
2016-10-26 23:10:21 -07:00 |
|
samcake
|
ce68be2a59
|
a few step further
|
2016-10-26 23:09:41 -07:00 |
|
Brad Davis
|
ce627eeea1
|
Updated metrics
|
2016-10-25 17:49:51 -07:00 |
|
Brad Davis
|
a9bf2a5cd3
|
Limit max texture size, don't force cubemaps to sparse page size
|
2016-10-25 17:47:42 -07:00 |
|
Brad Davis
|
f26dc4dcb9
|
Don't rectify skybox textures
|
2016-10-25 17:47:40 -07:00 |
|
Brad Davis
|
4bb8d4e78e
|
Force all loaded textures to sparse compatible sizes
|
2016-10-25 17:47:39 -07:00 |
|
samcake
|
07d1daaa9b
|
Designing IMage
|
2016-10-24 18:35:15 -07:00 |
|
samcake
|
4ac0c29d9b
|
Adding Image utility to GPU
|
2016-10-24 09:40:34 -07:00 |
|
samcake
|
5f9c713d44
|
Merging with upstream after resolving some conflicts
|
2016-10-12 09:22:12 -07:00 |
|
Gabriel Calero
|
834d9c0710
|
Adapt shader for GL ES support which requires operators of the same datatype
|
2016-10-11 12:15:49 -03:00 |
|
samcake
|
297907688c
|
Fixing reveiw comments
|
2016-10-10 12:43:33 -07:00 |
|
samcake
|
8a44140e6b
|
cleaning up the comments from review and trying something to adress the issue that showed up on i5
|
2016-10-07 16:04:19 -07:00 |
|
sam
|
bda835361a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-10-03 02:54:11 -07:00 |
|
sam
|
6f2452815c
|
pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader
|
2016-10-03 00:08:30 -07:00 |
|
samcake
|
89717720f7
|
CLeaning up code for Linux and Mac
|
2016-10-01 16:12:45 -07:00 |
|
Brad Hefta-Gaub
|
7fe16442fa
|
make calculateTextureInfo thread safe
|
2016-10-01 15:47:17 -07:00 |
|
samcake
|
5b4829e7b6
|
Brining back support for the ambinet lighting
|
2016-09-30 16:24:57 -07:00 |
|
sam
|
e143c05ef8
|
Keep on investigating the shading cost per light
|
2016-09-30 02:41:21 -07:00 |
|
samcake
|
2a0e67ee2a
|
REvisiting the full lighting code to optimize the perf
|
2016-09-29 19:06:26 -07:00 |
|
samcake
|
bb5493106f
|
smaller struct descriptions
|
2016-09-28 18:33:34 -07:00 |
|
samcake
|
b09151f2a2
|
Rearrange the light struc description in the shader side, needs the c++ to match now
|
2016-09-28 18:32:35 -07:00 |
|