|
 |
886ea3 |
From 4b56fa058a45b7c804d1a5fcaf7a70db0bd0581c Mon Sep 17 00:00:00 2001
|
|
|
886ea3 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
|
|
|
886ea3 |
Date: Tue, 1 Jan 2013 21:25:15 +0100
|
|
|
886ea3 |
Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma
|
|
|
886ea3 |
|
|
|
886ea3 |
Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme()
|
|
|
886ea3 |
does not have any effect here. Recent means xorg-server >= 1.7, since 2010.
|
|
|
886ea3 |
See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>.
|
|
|
886ea3 |
---
|
|
|
886ea3 |
src/video/SDL_gamma.c | 15 ++-------------
|
|
|
886ea3 |
1 files changed, 2 insertions(+), 13 deletions(-)
|
|
|
886ea3 |
|
|
|
886ea3 |
diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c
|
|
|
886ea3 |
index 4fd0370..464ab88 100644
|
|
|
886ea3 |
--- a/src/video/SDL_gamma.c
|
|
|
886ea3 |
+++ b/src/video/SDL_gamma.c
|
|
|
886ea3 |
@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp)
|
|
|
886ea3 |
|
|
|
886ea3 |
int SDL_SetGamma(float red, float green, float blue)
|
|
|
886ea3 |
{
|
|
|
886ea3 |
- int succeeded;
|
|
|
886ea3 |
+ int succeeded = -1;
|
|
|
886ea3 |
SDL_VideoDevice *video = current_video;
|
|
|
886ea3 |
SDL_VideoDevice *this = current_video;
|
|
|
886ea3 |
|
|
|
886ea3 |
- succeeded = -1;
|
|
|
886ea3 |
- /* Prefer using SetGammaRamp(), as it's more flexible */
|
|
|
886ea3 |
- {
|
|
|
886ea3 |
- Uint16 ramp[3][256];
|
|
|
886ea3 |
-
|
|
|
886ea3 |
- CalculateGammaRamp(red, ramp[0]);
|
|
|
886ea3 |
- CalculateGammaRamp(green, ramp[1]);
|
|
|
886ea3 |
- CalculateGammaRamp(blue, ramp[2]);
|
|
|
886ea3 |
- succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]);
|
|
|
886ea3 |
- }
|
|
|
886ea3 |
- if ( (succeeded < 0) && video->SetGamma ) {
|
|
|
886ea3 |
- SDL_ClearError();
|
|
|
886ea3 |
+ if ( video->SetGamma ) {
|
|
|
886ea3 |
succeeded = video->SetGamma(this, red, green, blue);
|
|
|
886ea3 |
}
|
|
|
886ea3 |
return succeeded;
|
|
|
886ea3 |
--
|
|
|
886ea3 |
1.7.8.6
|
|
|
886ea3 |
|