Ticket #7970: sdl_opengl_11.cpp.diff

File sdl_opengl_11.cpp.diff, 2.3 KB (added by SF/luke_br, 19 years ago)

FIXED! Sorry, my fault.

Line 
132a33,45
2>
3> #ifdef OPENGL
4>
5> /* Use OpenGL 1.1 */
6> #define OGL_1_1
7>
8> #include "fb2opengl11.h"
9>
10> int gl_shake=0;
11>
12> #endif
13>
14>
15250,253c263,270
16< base[i].r = b[0];
17< base[i].g = b[1];
18< base[i].b = b[2];
19< b += 4;
20---
21> #ifdef OPENGL
22> fb2gl_palette(i+start,b[0],b[1],b[2]);
23> #else
24> base[i].r = b[0];
25> base[i].g = b[1];
26> base[i].b = b[2];
27> #endif
28> b += 4;
29270c287,291
30<
31---
32>
33> #ifdef OPENGL
34> scaling=1;
35> _mode_flags |= DF_REAL_8BIT;
36> #else
37306c327,328
38<
39---
40> #endif
41>
42310a333
43> #ifndef OPENGL
44336a360,362
45> #else
46> {
47> #endif
48350a377,383
49> #ifdef OPENGL
50> #ifdef OGL_1_1
51> fb2gl_init(640,480,0,70, FB2GL_FS | FB2GL_320 | FB2GL_PITCH | FB2GL_RGBA | FB2GL_EXPAND);
52> #else
53> fb2gl_init(640,480,0,70, FB2GL_FS | FB2GL_320 | FB2GL_PITCH);
54> #endif
55> #else
56356c389,390
57<
58---
59> #endif
60>
61364a399
62> #ifndef OPENGL
63365a401
64> #endif
65545c581,582
66<
67---
68>
69> #ifndef OPENGL
70547a585
71> #endif
72556a595,599
73> #ifdef OPENGL
74> fb2gl_set_palette(_palette_changed_first,
75> _palette_changed_last - _palette_changed_first);
76> fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,gl_shake);
77> #else
78560c603,604
79<
80---
81> #endif
82>
83569a614,617
84> #ifdef OPENGL
85> gl_shake=_new_shake_pos;
86> fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,gl_shake);
87> #else
88571c619
89<
90---
91> #endif
92576a625
93> #ifndef OPENGL
94662c711,712
95<
96---
97> #endif
98>
99668a719,723
100> #ifdef OPENGL
101> fb2gl_set_palette(_palette_changed_first,
102> _palette_changed_last - _palette_changed_first);
103> fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,gl_shake);
104> #else
105671a727
106> #endif
107675c731,732
108<
109---
110>
111> #ifndef OPENGL
112682a740,749
113> #else /* OpenGL */
114> else gl_shake=0; /* _new_sake_pos == _current_shake_pos */
115> if (_palette_changed_last != 0) {
116> fb2gl_set_palette(_palette_changed_first,
117> _palette_changed_last - _palette_changed_first);
118> _palette_changed_last=0;
119> }
120> fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,gl_shake);
121> #endif
122>
123877a945,948
124> #ifdef OPENGL
125> fb2gl_set_palette(0,256);
126> fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,gl_shake);
127> #else
128882a954
129> #endif