yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'KDE/4.9'

Browse source 
Conflicts:
	kwin/eglonxbackend.cpp
	kwin/glxbackend.cpp
	kwin/libkwineffects/kwinglplatform.cpp
This commit is contained in:
Fredrik Höglund 2012-10-30 23:26:06 +01:00
commit 6e9901e5c3
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
glxbackend.cpp
View file

@ -207,12 +207,15 @@ bool GlxBackend::initBufferConfigs()
fbcbuffer_nondb = NULL; fbcbuffer_nondb = NULL;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
int back, stencil, depth, caveat, alpha; int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha;
back = i > 0 ? INT_MAX : 1; back = i > 0 ? INT_MAX : 1;
stencil = INT_MAX; stencil = INT_MAX;
depth = INT_MAX; depth = INT_MAX;
caveat = INT_MAX; caveat = INT_MAX;
msaa_buffers = INT_MAX;
msaa_samples = INT_MAX;
alpha = 0; alpha = 0;
for (int j = 0; j < cnt; j++) { for (int j = 0; j < cnt; j++) {
XVisualInfo *vi; XVisualInfo *vi;
int visual_depth; int visual_depth;
@ -259,10 +262,26 @@ bool GlxBackend::initBufferConfigs()
GLX_CONFIG_CAVEAT, &caveat_value); GLX_CONFIG_CAVEAT, &caveat_value);
if (caveat_value > caveat) if (caveat_value > caveat)
continue; continue;
int msaa_buffers_value;
glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS,
&msaa_buffers_value);
if (msaa_buffers_value > msaa_buffers)
continue;
int msaa_samples_value;
glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES,
&msaa_samples_value);
if (msaa_samples_value > msaa_samples)
continue;
back = back_value; back = back_value;
stencil = stencil_value; stencil = stencil_value;
depth = depth_value; depth = depth_value;
caveat = caveat_value; caveat = caveat_value;
msaa_buffers = msaa_buffers_value;
msaa_samples = msaa_samples_value;
if (i > 0) if (i > 0)
fbcbuffer_nondb = fbconfigs[ j ]; fbcbuffer_nondb = fbconfigs[ j ];
else else

1
libkwineffects/kwinglplatform.cpp
View file

@ -794,6 +794,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_supportsGLSL = false; m_supportsGLSL = false;
m_limitedGLSL = m_supportsGLSL && m_chipClass < I965; m_limitedGLSL = m_supportsGLSL && m_chipClass < I965;
m_looseBinding = true;
if (m_chipClass < I965) { if (m_chipClass < I965) {
m_recommendedCompositor = OpenGL1Compositing; m_recommendedCompositor = OpenGL1Compositing;