]>
Commit | Line | Data |
---|---|---|
e8737114 RT |
1 | --- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800 |
2 | +++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800 | |
3 | @@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di | |
4 | ||
5 | /*****************************************************************/ | |
6 | /* tree depth = 13 */ | |
7 | -static const int_fast16_t VendorPriv_dispatch_tree[155] = { | |
8 | +static const int_fast16_t VendorPriv_dispatch_tree[159] = { | |
9 | /* [0] -> opcode range [0, 131072], node depth 1 */ | |
10 | 2, | |
11 | 5, | |
12 | @@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis | |
13 | /* [152] -> opcode range [65536, 65552], node depth 13 */ | |
14 | 1, | |
15 | LEAF(88), | |
16 | + 156, | |
17 | EMPTY_LEAF, | |
18 | ||
19 | + /* [156] -> opcode range [65544, 65552], node depth 13 */ | |
20 | + 1, | |
21 | + LEAF(96), | |
22 | + EMPTY_LEAF, | |
23 | }; | |
24 | ||
25 | -static const void *VendorPriv_function_table[96][2] = { | |
26 | +static const void *VendorPriv_function_table[99][2] = { | |
27 | /* [ 0] = 0 */ {NULL, NULL}, | |
28 | /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT}, | |
29 | /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT}, | |
30 | @@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t | |
31 | /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX}, | |
32 | /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX}, | |
33 | /* [ 95] = 65543 */ {NULL, NULL}, | |
34 | + /* [ 96] = 65544 */ {NULL, NULL}, | |
35 | + /* [ 97] = 65545 */ {NULL, NULL}, | |
36 | + /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX}, | |
37 | }; | |
38 | ||
39 | const struct __glXDispatchInfo VendorPriv_dispatch_info = { | |
40 | --- xorg-server-9999/GL/glx/glxdri.c.orig 2006-12-18 23:17:37.000000000 +0800 | |
41 | +++ xorg-server-9999/GL/glx/glxdri.c 2006-12-18 23:18:16.000000000 +0800 | |
42 | @@ -371,13 +371,13 @@ __glXDRIbindTexImage(__GLXcontext *baseC | |
43 | type = GL_UNSIGNED_SHORT_5_6_5; | |
44 | } | |
45 | ||
46 | - if (!(glxCountBits(pixmap->drawable.width) == 1 && | |
47 | - glxCountBits(pixmap->drawable.height) == 1) | |
48 | - /* || strstr(CALL_GetString(GL_EXTENSIONS, | |
49 | - "GL_ARB_texture_non_power_of_two")) */) | |
50 | + //if (!(glxCountBits(pixmap->drawable.width) == 1 && | |
51 | + // glxCountBits(pixmap->drawable.height) == 1) | |
52 | + ///* || strstr(CALL_GetString(GL_EXTENSIONS, | |
53 | + // "GL_ARB_texture_non_power_of_two")) */) | |
54 | target = GL_TEXTURE_RECTANGLE_ARB; | |
55 | - else | |
56 | - target = GL_TEXTURE_2D; | |
57 | + //else | |
58 | + //target = GL_TEXTURE_2D; | |
59 | ||
60 | CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, | |
61 | pixmap->devKind / bpp) ); |