AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: fix breakage from gl_config::visualType removal

Browse Source
This commit is contained in:
Brian Paul
2010-10-13 08:32:08 -06:00
parent 95c18abb03
commit c3ed27ec76
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/x11/xm_api.c
+4 -4
View File
@@ -1047,7 +1047,7 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
XMesaColormap cmap)
{
int client = 0;
const int xclass = v->mesa_visual.visualType;
const int xclass = v->visualType;
#ifdef XFree86Server
client = (window) ? CLIENT_ID(window->id) : 0;
@@ -1408,9 +1408,9 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
#endif
#if defined(XFree86Server) || !(defined(__cplusplus) || defined(c_plusplus))
v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->class);
v->visualType = xmesa_convert_from_x_visual_type(visinfo->class);
#else
v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
v->visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
#endif
v->mesa_visual.visualRating = visualCaveat;
@@ -1421,7 +1421,7 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
(void) initialize_visual_and_buffer( v, NULL, 0, 0 );
{
const int xclass = v->mesa_visual.visualType;
const int xclass = v->visualType;
if (xclass == GLX_TRUE_COLOR || xclass == GLX_DIRECT_COLOR) {
red_bits = _mesa_bitcount(GET_REDMASK(v));
green_bits = _mesa_bitcount(GET_GREENMASK(v));
src/mesa/drivers/x11/xm_dd.c
+1 -1
View File
@@ -139,7 +139,7 @@ color_mask(struct gl_context *ctx,
{
const XMesaContext xmesa = XMESA_CONTEXT(ctx);
XMesaBuffer xmbuf;
const int xclass = xmesa->xm_visual->mesa_visual.visualType;
const int xclass = xmesa->xm_visual->visualType;
(void) amask;
if (ctx->DrawBuffer->Name != 0)
src/mesa/drivers/x11/xmesaP.h
+1
View File
@@ -87,6 +87,7 @@ struct xmesa_visual {
struct gl_config mesa_visual; /* Device independent visual parameters */
XMesaDisplay *display; /* The X11 display */
int screen, visualID;
int visualType;
#ifdef XFree86Server
GLint ColormapEntries;
GLint nplanes;