TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

display: also avoid getting more than 24 color bits if 0 were requested

Browse Source 
See issue #197
This commit is contained in:
rdb 2017-11-26 00:05:01 +01:00
parent 749b23a190
commit 3be22679a4
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/display/frameBufferProperties.cxx
View File

@ -584,8 +584,7 @@ get_quality(const FrameBufferProperties &reqs) const {
// However, deduct for color bits above 24, if we are requesting only 1.
// This is to prevent choosing a 64-bit color mode in NVIDIA cards that
// is linear and therefore causes the gamma to be off in non-sRGB pipelines.
if ((reqs._property[FBP_color_bits] == 1 || reqs._property[FBP_color_bits] == 3) &&
_property[FBP_color_bits] > 24) {
if (reqs._property[FBP_color_bits] <= 3 && _property[FBP_color_bits] > 24) {
quality -= 100;
}

43
tests/display/test_fbprops.py
View File

@ -53,18 +53,31 @@ def test_fbquality_rgba64():
# This issue occurs if we are requesting 1 bit, not if we are requesting
# a specific amount. There are several ways to do that, so we want to
# assert that none of them will yield a 64-bit color buffer.
req_color = FrameBufferProperties()
req_color.color_bits = 1
req_color0 = FrameBufferProperties()
req_color0.color_bits = 0
req_color_alpha = FrameBufferProperties()
req_color_alpha.color_bits = 1
req_color_alpha.alpha_bits = 1
req_color1 = FrameBufferProperties()
req_color1.color_bits = 1
req_rgb = FrameBufferProperties()
req_rgb.set_rgba_bits(1, 1, 1, 0)
req_color0_alpha0 = FrameBufferProperties()
req_color0_alpha0.color_bits = 0
req_color0_alpha0.alpha_bits = 0
req_rgb_alpha = FrameBufferProperties()
req_rgb_alpha.set_rgba_bits(1, 1, 1, 1)
req_color1_alpha1 = FrameBufferProperties()
req_color1_alpha1.color_bits = 1
req_color1_alpha1.alpha_bits = 1
req_rgb0 = FrameBufferProperties()
req_rgb0.set_rgba_bits(0, 0, 0, 0)
req_rgb1 = FrameBufferProperties()
req_rgb1.set_rgba_bits(1, 1, 1, 0)
req_rgb0_alpha0 = FrameBufferProperties()
req_rgb0_alpha0.set_rgba_bits(0, 0, 0, 0)
req_rgb1_alpha1 = FrameBufferProperties()
req_rgb1_alpha1.set_rgba_bits(1, 1, 1, 1)
fb_rgba8 = FrameBufferProperties()
fb_rgba8.rgb_color = True
@ -74,7 +87,11 @@ def test_fbquality_rgba64():
fb_rgba16.rgb_color = True
fb_rgba16.set_rgba_bits(16, 16, 16, 16)
assert fb_rgba8.get_quality(req_color) > fb_rgba16.get_quality(req_color)
assert fb_rgba8.get_quality(req_color_alpha) > fb_rgba16.get_quality(req_color_alpha)
assert fb_rgba8.get_quality(req_rgb) > fb_rgba16.get_quality(req_rgb)
assert fb_rgba8.get_quality(req_rgb_alpha) > fb_rgba16.get_quality(req_rgb_alpha)
assert fb_rgba8.get_quality(req_color0) > fb_rgba16.get_quality(req_color0)
assert fb_rgba8.get_quality(req_color1) > fb_rgba16.get_quality(req_color1)
assert fb_rgba8.get_quality(req_color0_alpha0) > fb_rgba16.get_quality(req_color0_alpha0)
assert fb_rgba8.get_quality(req_color1_alpha1) > fb_rgba16.get_quality(req_color1_alpha1)
assert fb_rgba8.get_quality(req_rgb0) > fb_rgba16.get_quality(req_rgb0)
assert fb_rgba8.get_quality(req_rgb1) > fb_rgba16.get_quality(req_rgb1)
assert fb_rgba8.get_quality(req_rgb0_alpha0) > fb_rgba16.get_quality(req_rgb0_alpha0)
assert fb_rgba8.get_quality(req_rgb1_alpha1) > fb_rgba16.get_quality(req_rgb1_alpha1)