Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,783 Commits 20 Branches 51 Tags
be5d2f20bc0c809c6a32abaedbb7104026bcc30f
Commit Graph

351 Commits

Author SHA1 Message Date
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Lirusaito
6a95f3b692 Fix Issue 1654 based on Shyotl's notes and work in Alchemy. 
That's the Intel HD 3000 on Windows can't do ALM bug, by the way.

#close SV-1654
 2016-02-22 20:51:22 -05:00
Lirusaito
c3e593c20e Fixes to gcc and debugs and such. 2016-02-15 16:35:31 -05:00
Lirusaito
6e3f404a1c Rip out old workarounds, hacks and macros for newer C++ features not being supported back in the day. 
Adds LL_COMPILE_TIME_MESSAGE support to Linux.

llfinite -> std::isfinite
llisnan -> std::isnan
vector_shrink_to_fit -> vector.shrink_to_fit
 2016-02-14 17:37:10 -05:00
Drake Arconis
58e08a972d Get windows 64-bit building 2016-01-16 18:50:38 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Lirusaito
c28b241c69 Merge branch 'master' of git://github.com/siana/SingularityViewer 2015-11-20 07:24:30 -05:00
Inusaito Sayori
bc0709b9c6 More work on accordions, let params do lluiimages like upstream 2015-10-05 15:08:48 -04:00
Siana Gearz
62a7704a4f You shaved 2 minutes off compile time... 
... but you are still hungry
 2015-09-18 04:29:38 +02:00
Latif Khalifa
b780878a55 Be more portable. 
UINT and DWORD to U32.
Fixes non windows builds.
 2015-08-13 06:29:37 -07:00
Shyotl
09f3376259 Apparently there's some poor branch prediction behavior with various gcc versions. Apply tweak from v3 in assert_glerror(). 2015-07-23 01:39:50 -05:00
Shyotl
22b12223ef Manual swizzling of textures when in coreGL mode incorrectly overrode pixel pointer just prior to copying to to scratch buffer. 2015-07-23 01:33:28 -05:00
Shyotl
3fc035f568 Trivial cleanup of removal of translation component from transformation matrix when drawing cubemaps. 2015-07-23 01:30:31 -05:00
Shyotl
3f3ead0988 Merge branch 'master' into AISv3-WIP 
Conflicts:
	indra/newview/llinventorybridge.cpp
 2015-06-27 01:30:28 -05:00
Shyotl
af81f692de Remove superfluous check in llfontgl. 2015-06-25 20:21:33 -05:00
Inusaito Sayori
990b5f9bb4 Linux Build Foxes 2015-06-19 19:55:56 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
0688cda8d2 More thorough VBO teardown in resetVertexBuffers/stopGL. Also, found cases where gGL.init failed to be called when it should have been. 2015-06-01 17:58:19 -05:00
Shyotl
f2883801ec Harden context recreation texture handling. 2015-06-01 16:38:25 -05:00
Shyotl
a7ba5145cc Inline shader uniform setters, and cache values in vectors instead of maps. Also, deleted mUniformNameMap, mUniformNameMap, and uniform2i, as they were unused. 2015-05-23 17:16:02 -05:00
Shyotl
690f3614c1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 
Conflicts:
	indra/llrender/llpostprocess.cpp
 2015-05-16 02:53:19 -05:00
Shyotl
966c5aa409 Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction. 2015-05-16 02:31:06 -05:00
Shyotl
8943439629 Remove dupilicate perlin noise impl, and update the remaining one. 2015-05-16 02:30:32 -05:00
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit. 
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
 2015-03-20 22:04:04 -04:00
Shyotl
8c58a9c276 Oops, these LLFontGL changes are vital and were missed in an earlier commit. 2015-02-27 05:32:29 -06:00
Shyotl
b7454f5f43 Cleanup in llfontgl, as well as more aggressive bounds checking. 2015-02-15 21:45:33 -06:00
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Shyotl
2132978c41 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2015-01-26 15:26:02 -06:00
Inusaito Sayori
844444c33b Optimize loops calling endInstances() 
Thankies to Drake Arconis/Alchemy~
 2015-01-12 18:06:49 -05:00
Shyotl
c2abbaedc8 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio 2014-11-22 22:20:32 -06:00
Shyotl
f6209dec34 Silence some LL_INFOS spam on shader init. 2014-09-15 15:23:22 -05:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Latif Khalifa
a6ac8e1f71 Workaround for clang bugs 2014-08-09 11:24:22 -04:00
Shyotl
9cbcf8fe34 Removed glh_linear and glu dependencies from viewer. 2014-07-03 02:11:45 -05:00
Shyotl
96df7b82de Change texture default to non-auto-alphamaskable, non-pickable. Only 'fetchable' textures may qualify for either. 2014-06-22 03:53:08 -05:00
Shyotl
5cb5d284c3 Initialize LLRender::mHasTextureSwizzle to false. 2014-06-22 03:44:48 -05:00
Shyotl
7c073c1db7 Explicit enforcement of alignment for all aligned types, including structures with aligned members. (Compiler handholding) 2014-06-22 03:39:33 -05:00
Shyotl
061178ad82 Migrated gl matrix stack to LLMatrix4a 2014-06-22 03:34:51 -05:00
Shyotl
8f6a578ec0 Migration to LLMatrix4a instead of glh::matrix4f 2014-06-15 22:42:32 -05:00
Shyotl
24ca32f9f7 Replace gluProjectf/gluUnprojectf with own versions. Also changed gGLModelView/gGLProjection and other related matrices to LLMatrix4a. 2014-06-06 01:59:04 -05:00
Shyotl
a1eb30ae87 Keep old non-swizzle method around since GL_ARB_texture_swizzle has poor support prior to 3.3 (on osx especially) 2014-05-17 18:25:21 -05:00
Shyotl
0a89503edd Renamed glUniformMatrix3x4fvARB to glUniformMatrix3x4fv, since I don't think it ever had the ARB postfix. Also use its the properly named (although identical to the current) function pointer signature. 2014-05-17 04:04:33 -05:00
Shyotl
67c8ac2b04 Skinned shaders were exceeding maximum amount of vertex uniforms on amd hardware. 
-Changed the transform matrix uniform to a 3x4 matrix and packed translation into it to free up uniforms. (3x3 is converted to 3x4 internally, so we were needlessly eating 3*52 extra uniform slots. translationPalette might also have been treated as a vec4 internally too, wasting 52 more slots.)
-matrix3x4 requires opengl2.1 and newer, so added a new featuretable mask.
-Also added a featuretable mask to disable hardware skinning and deferred shading on hardware with less than 1024 vertex uniforms.
NOTE: On old old old amd hardware, evidently a 3x4 matrix might be upgraded to 4x4. I'm unsure, but I doubt such hardware has 1024+ uniform components available to begin with. 4x3 supposedly doesn't do this, but opengl is column-major, so this makes little sense.
 2014-05-17 03:31:45 -05:00
Shyotl
117eca3c98 Try some swizzling instead of forcing everything to rgba8 with core profile. Avoids manual conversions with scratch buffers. Works for all pixel datatypes. Cleaner. Uses less vram. 
Also, fixed textures when running core pofile.
 2014-05-14 03:05:53 -05:00
Shyotl
98f9a09b39 sunlight_color_copy need only be vec3. 2014-05-08 16:39:41 -05:00
Shyotl
7e8e8bdb26 Disable some diagnostic gunk eating memory. 2014-05-08 16:35:12 -05:00
Shyotl
e2a0f801b9 Have LLRender::color4ub fall back to uniform if bound vbo lacks color attribute. Fixed fixed-function call in LLFacePool::LLOverrideFaceColor::setColor. 2014-05-08 16:29:53 -05:00
Shyotl
7158a3c83d Fixed an annoying showstopper regarding rigged attachment vertex corruption. Rigged meshes have can have poor weighting, causing potential div-by-zero issues. 2014-05-08 15:11:12 -05:00
Shyotl
d6fdaa93a4 Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel). 2014-03-28 02:34:03 -05:00