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

kwin/glx: Avoid MSAA configs in initDrawableConfigs()

Browse source 
This is the same fix that was applied to initBufferConfigs() in commit
6cf057777555a5d0c834de3a0165a62916cf3b40.

CCBUG: 315089
This commit is contained in:
Fredrik Höglund 2013-04-09 18:55:21 +02:00
parent c0eab5b8e9
commit 0168f7eacf
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
glxbackend.cpp
View file

@ -323,11 +323,13 @@ bool GlxBackend::initDrawableConfigs()
GLXFBConfig *fbconfigs = glXGetFBConfigs(display(), DefaultScreen(display()), &cnt); GLXFBConfig *fbconfigs = glXGetFBConfigs(display(), DefaultScreen(display()), &cnt);
for (int i = 0; i <= 32; i++) { for (int i = 0; i <= 32; i++) {
int back, stencil, depth, caveat, alpha, mipmap, rgba; int back, stencil, depth, caveat, alpha, mipmap, msaa_buffers, msaa_samples, rgba;
back = INT_MAX; back = INT_MAX;
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;
mipmap = 0; mipmap = 0;
rgba = 0; rgba = 0;
fbcdrawableinfo[ i ].fbconfig = NULL; fbcdrawableinfo[ i ].fbconfig = NULL;
@ -395,12 +397,27 @@ bool GlxBackend::initDrawableConfigs()
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;
// ok, config passed all tests, it's the best one so far // ok, config passed all tests, it's the best one so far
fbcdrawableinfo[ i ].fbconfig = fbconfigs[ j ]; fbcdrawableinfo[ i ].fbconfig = fbconfigs[ j ];
caveat = caveat_value; caveat = caveat_value;
back = back_value; back = back_value;
stencil = stencil_value; stencil = stencil_value;
depth = depth_value; depth = depth_value;
msaa_buffers = msaa_buffers_value;
msaa_samples = msaa_samples_value;
mipmap = 0; mipmap = 0;
glXGetFBConfigAttrib(display(), fbconfigs[ j ], glXGetFBConfigAttrib(display(), fbconfigs[ j ],
GLX_BIND_TO_TEXTURE_TARGETS_EXT, &value); GLX_BIND_TO_TEXTURE_TARGETS_EXT, &value);