fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/glx: Include main/core.h.

Browse source 
Make st/glx include only main/core.h from core mesa.
This commit is contained in:
Chia-I Wu 2010-08-23 17:31:38 +08:00
parent bfd7c9ac22
commit 40fd4323b4
5 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/state_trackers/glx/xlib/glx_api.c
View file

@ -34,10 +34,6 @@
#include "GL/glx.h"
#include "xm_api.h"
#include "main/context.h"
#include "main/macros.h"
#include "main/imports.h"
#include "main/version.h"
/* This indicates the client-side GLX API and GLX encoder version. */
@ -1299,7 +1295,7 @@ glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
XMesaContext xm_dst = dst->xmesaContext;
(void) dpy;
if (MakeCurrent_PrevContext == src) {
_mesa_Flush();
glFlush();
}
XMesaCopyContext(xm_src, xm_dst, mask);
}

3
src/gallium/state_trackers/glx/xlib/glx_usefont.c
View file

@ -30,8 +30,7 @@
*/
#include "main/context.h"
#include "main/imports.h"
#include "main/core.h"
#include <GL/glx.h>

43
src/gallium/state_trackers/glx/xlib/xm_api.c
View file

@ -56,7 +56,6 @@
#include "xm_api.h"
#include "xm_st.h"
#include "main/context.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
@ -755,15 +754,39 @@ XMesaVisual XMesaCreateVisual( Display *display,
alpha_bits = v->mesa_visual.alphaBits;
}
_mesa_initialize_visual( &v->mesa_visual,
db_flag, stereo_flag,
red_bits, green_bits,
blue_bits, alpha_bits,
depth_size,
stencil_size,
accum_red_size, accum_green_size,
accum_blue_size, accum_alpha_size,
0 );
/* initialize visual */
{
__GLcontextModes *vis = &v->mesa_visual;
vis->rgbMode = GL_TRUE;
vis->doubleBufferMode = db_flag;
vis->stereoMode = stereo_flag;
vis->redBits = red_bits;
vis->greenBits = green_bits;
vis->blueBits = blue_bits;
vis->alphaBits = alpha_bits;
vis->rgbBits = red_bits + green_bits + blue_bits;
vis->indexBits = 0;
vis->depthBits = depth_size;
vis->stencilBits = stencil_size;
vis->accumRedBits = accum_red_size;
vis->accumGreenBits = accum_green_size;
vis->accumBlueBits = accum_blue_size;
vis->accumAlphaBits = accum_alpha_size;
vis->haveAccumBuffer = accum_red_size > 0;
vis->haveDepthBuffer = depth_size > 0;
vis->haveStencilBuffer = stencil_size > 0;
vis->numAuxBuffers = 0;
vis->level = 0;
vis->pixmapMode = 0;
vis->sampleBuffers = 0;
vis->samples = 0;
}
v->stvis.buffer_mask = ST_ATTACHMENT_FRONT_LEFT_MASK;
if (db_flag)

2
src/gallium/state_trackers/glx/xlib/xm_api.h
View file

@ -57,7 +57,7 @@ and create a window, you must do the following to use the X/Mesa interface:
#define XMESA_H
#include "main/mtypes.h"
#include "main/core.h" /* for GLvisual and MESA_VERSION_STRING */
#include "state_tracker/st_api.h"
#include "os/os_thread.h"

5
src/gallium/state_trackers/glx/xlib/xm_st.c
View file

@ -26,12 +26,11 @@
* Chia-I Wu <olv@lunarg.com>
*/
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "xm_api.h"
#include "xm_st.h"
#include "util/u_inlines.h"
struct xmesa_st_framebuffer {
XMesaDisplay display;
XMesaBuffer buffer;