Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

Browse Source
This commit is contained in:
Lirusaito
2019-03-25 17:21:16 -04:00
parent f9878e75e3 f3afe45e72
commit 06dfeb72d7
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llgl.cpp
View File

@@ -549,8 +549,8 @@ void LLGLManager::initWGL()
#if LL_WINDOWS && !LL_MESA_HEADLESS #if LL_WINDOWS && !LL_MESA_HEADLESS
if (ExtensionExists("WGL_ARB_pixel_format")) if (ExtensionExists("WGL_ARB_pixel_format"))
{ {
wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)wglGetProcAddress("wglGetPixelFormatAttribiv"); wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)wglGetProcAddress("wglGetPixelFormatAttribivARB");
wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormat"); wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
} }
else else
{ {
@@ -559,7 +559,7 @@ void LLGLManager::initWGL()
if (ExtensionExists("WGL_ARB_create_context")) if (ExtensionExists("WGL_ARB_create_context"))
{ {
wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribs"); wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribsARB");
} }
else else
{ {

2
indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl
View File

@@ -40,7 +40,7 @@ uniform float max_cof;
uniform float res_scale; uniform float res_scale;
uniform float dof_width; uniform float dof_width;
uniform float dof_height; uniform float dof_height;
uniform float kern_scale; uniform vec2 kern_scale;
VARYING vec2 vary_fragcoord; VARYING vec2 vary_fragcoord;

3
indra/newview/pipeline.cpp
View File

@@ -4146,10 +4146,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD)) if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
{ {
updateHWLightMode(LIGHT_MODE_NORMAL); updateHWLightMode(LIGHT_MODE_NORMAL);
llassert_always(LLGLState<GL_LIGHTING>::checkEnabled());
} }
llassert_always(LLGLState<GL_LIGHTING>::checkEnabled());
BOOL occlude = sUseOcclusion > 1; BOOL occlude = sUseOcclusion > 1;
U32 cur_type = 0; U32 cur_type = 0;