michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: Folded three ramp arrays into one, to avoid multiple allocations

This commit is contained in:
Elias Naur 2005-11-21 13:43:49 +00:00
parent 6e5ed9d1ff
commit c9669d20c9
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/native/linux/display.c
View File

@ -71,9 +71,7 @@ static int current_width;
static int current_height; static int current_height;
static int current_freq; static int current_freq;
static int saved_gamma_ramp_length = 0; static int saved_gamma_ramp_length = 0;
static unsigned short *r_ramp = NULL; static unsigned short *saved_ramp = NULL;
static unsigned short *g_ramp = NULL;
static unsigned short *b_ramp = NULL;
static unsigned short *current_ramp = NULL; static unsigned short *current_ramp = NULL;
static int current_gamma_ramp_length = 0; static int current_gamma_ramp_length = 0;
@ -284,12 +282,8 @@ static bool setMode(JNIEnv *env, Display *disp, int screen, jint extension, int
} }
static void freeSavedGammaRamps() { static void freeSavedGammaRamps() {
free(r_ramp); free(saved_ramp);
free(g_ramp); saved_ramp = NULL;
free(b_ramp);
r_ramp = NULL;
g_ramp = NULL;
b_ramp = NULL;
saved_gamma_ramp_length = 0; saved_gamma_ramp_length = 0;
} }
@ -346,10 +340,9 @@ jobject initDisplay(JNIEnv *env, int screen, jint extension) {
/* Fetch the current gamma ramp */ /* Fetch the current gamma ramp */
saved_gamma_ramp_length = getGammaRampLengthOfDisplay(env, disp, screen); saved_gamma_ramp_length = getGammaRampLengthOfDisplay(env, disp, screen);
if (saved_gamma_ramp_length > 0) { if (saved_gamma_ramp_length > 0) {
r_ramp = (unsigned short *)malloc(sizeof(unsigned short)*saved_gamma_ramp_length); saved_ramp = (unsigned short *)malloc(sizeof(unsigned short)*3*saved_gamma_ramp_length);
g_ramp = (unsigned short *)malloc(sizeof(unsigned short)*saved_gamma_ramp_length); if (!XF86VidModeGetGammaRamp(disp, screen, saved_gamma_ramp_length, saved_ramp,
b_ramp = (unsigned short *)malloc(sizeof(unsigned short)*saved_gamma_ramp_length); saved_ramp + saved_gamma_ramp_length, saved_ramp + saved_gamma_ramp_length*2))
if (!XF86VidModeGetGammaRamp(disp, screen, saved_gamma_ramp_length, r_ramp, g_ramp, b_ramp))
freeSavedGammaRamps(); freeSavedGammaRamps();
} }
XCloseDisplay(disp); XCloseDisplay(disp);
@ -420,7 +413,8 @@ void resetDisplayMode(JNIEnv *env, int screen, jint extension, bool temporary) {
printfDebugJava(env, "Failed to reset mode"); printfDebugJava(env, "Failed to reset mode");
} }
if (saved_gamma_ramp_length > 0) { if (saved_gamma_ramp_length > 0) {
XF86VidModeSetGammaRamp(disp, screen, saved_gamma_ramp_length, r_ramp, g_ramp, b_ramp); XF86VidModeSetGammaRamp(disp, screen, saved_gamma_ramp_length, saved_ramp, saved_ramp +
saved_gamma_ramp_length, saved_ramp + saved_gamma_ramp_length*2);
} }
// decDisplay(); // decDisplay();
XCloseDisplay(disp); XCloseDisplay(disp);