dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21572) -Codechange: [OSX] One palette is enough, we cannot use two colour depths at once

Browse Source
This commit is contained in:
planetmaker
2010-12-21 15:48:43 +00:00
parent b633ffaa1d
commit 0d3a0bb1c7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/cocoa/wnd_quickdraw.mm
View File

@@ -92,8 +92,7 @@ class WindowQuickdrawSubdriver: public CocoaSubdriver {
Rect dirty_rects[MAX_DIRTY_RECTS]; Rect dirty_rects[MAX_DIRTY_RECTS];
int num_dirty_rects; int num_dirty_rects;
uint16 palette16[256]; uint32 palette[256];
uint32 palette32[256];
public: public:
bool active; bool active;
@@ -448,7 +447,7 @@ void WindowQuickdrawSubdriver::Blit32ToView32(int left, int top, int right, int
void WindowQuickdrawSubdriver::BlitIndexedToView32(int left, int top, int right, int bottom) void WindowQuickdrawSubdriver::BlitIndexedToView32(int left, int top, int right, int bottom)
{ {
const uint32 *pal = this->palette32; const uint32 *pal = this->palette;
const uint8 *src = (uint8*)this->pixel_buffer; const uint8 *src = (uint8*)this->pixel_buffer;
uint32 *dst = (uint32*)this->window_buffer; uint32 *dst = (uint32*)this->window_buffer;
uint width = this->window_width; uint width = this->window_width;
@@ -463,7 +462,7 @@ void WindowQuickdrawSubdriver::BlitIndexedToView32(int left, int top, int right,
void WindowQuickdrawSubdriver::BlitIndexedToView16(int left, int top, int right, int bottom) void WindowQuickdrawSubdriver::BlitIndexedToView16(int left, int top, int right, int bottom)
{ {
const uint16 *pal = this->palette16; const uint32 *pal = this->palette;
const uint8 *src = (uint8*)this->pixel_buffer; const uint8 *src = (uint8*)this->pixel_buffer;
uint16 *dst = (uint16*)this->window_buffer; uint16 *dst = (uint16*)this->window_buffer;
uint width = this->window_width; uint width = this->window_width;
@@ -609,7 +608,7 @@ void WindowQuickdrawSubdriver::UpdatePalette(uint first_color, uint num_colors)
clr32 |= (uint32)_cur_palette[i].r << 16; clr32 |= (uint32)_cur_palette[i].r << 16;
clr32 |= (uint32)_cur_palette[i].g << 8; clr32 |= (uint32)_cur_palette[i].g << 8;
clr32 |= (uint32)_cur_palette[i].b; clr32 |= (uint32)_cur_palette[i].b;
this->palette32[i] = clr32; this->palette[i] = clr32;
} }
break; break;
case 16: case 16:
@@ -618,7 +617,7 @@ void WindowQuickdrawSubdriver::UpdatePalette(uint first_color, uint num_colors)
clr16 |= (uint16)((_cur_palette[i].r >> 3) & 0x1f) << 10; clr16 |= (uint16)((_cur_palette[i].r >> 3) & 0x1f) << 10;
clr16 |= (uint16)((_cur_palette[i].g >> 3) & 0x1f) << 5; clr16 |= (uint16)((_cur_palette[i].g >> 3) & 0x1f) << 5;
clr16 |= (uint16)((_cur_palette[i].b >> 3) & 0x1f); clr16 |= (uint16)((_cur_palette[i].b >> 3) & 0x1f);
this->palette16[i] = clr16; this->palette[i] = clr16;
} }
break; break;
} }