
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
146 lines
4.7 KiB
C
146 lines
4.7 KiB
C
/*
|
|
* (C) Copyright IBM Corporation 2002, 2004
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* on the rights to use, copy, modify, merge, publish, distribute, sub
|
|
* license, and/or sell copies of the Software, and to permit persons to whom
|
|
* the Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Ian Romanick <idr@us.ibm.com>
|
|
*/
|
|
|
|
#ifndef DRI_DEBUG_H
|
|
#define DRI_DEBUG_H
|
|
|
|
#include <GL/gl.h>
|
|
#include <GL/internal/dri_interface.h>
|
|
#include "context.h"
|
|
|
|
typedef struct __DRIutilversionRec2 __DRIutilversion2;
|
|
|
|
struct dri_debug_control {
|
|
const char * string;
|
|
unsigned flag;
|
|
};
|
|
|
|
/**
|
|
* Description of the entry-points and parameters for an OpenGL function.
|
|
*/
|
|
struct dri_extension_function {
|
|
/**
|
|
* \brief
|
|
* Packed string describing the parameter signature and the entry-point
|
|
* names.
|
|
*
|
|
* The parameter signature and the names of the entry-points for this
|
|
* function are packed into a single string. The substrings are
|
|
* separated by NUL characters. The whole string is terminated by
|
|
* two consecutive NUL characters.
|
|
*/
|
|
const char * strings;
|
|
|
|
|
|
/**
|
|
* Location in the remap table where the dispatch offset should be
|
|
* stored.
|
|
*/
|
|
int remap_index;
|
|
|
|
/**
|
|
* Offset of the function in the dispatch table.
|
|
*/
|
|
int offset;
|
|
};
|
|
|
|
/**
|
|
* Description of the API for an extension to OpenGL.
|
|
*/
|
|
struct dri_extension {
|
|
/**
|
|
* Name of the extension.
|
|
*/
|
|
const char * name;
|
|
|
|
|
|
/**
|
|
* Pointer to a list of \c dri_extension_function structures. The list
|
|
* is terminated by a structure with a \c NULL
|
|
* \c dri_extension_function::strings pointer.
|
|
*/
|
|
const struct dri_extension_function * functions;
|
|
};
|
|
|
|
/**
|
|
* Used to store a version which includes a major range instead of a single
|
|
* major version number.
|
|
*/
|
|
struct __DRIutilversionRec2 {
|
|
int major_min; /** min allowed Major version number. */
|
|
int major_max; /** max allowed Major version number. */
|
|
int minor; /**< Minor version number. */
|
|
int patch; /**< Patch-level. */
|
|
};
|
|
|
|
extern unsigned driParseDebugString( const char * debug,
|
|
const struct dri_debug_control * control );
|
|
|
|
extern unsigned driGetRendererString( char * buffer,
|
|
const char * hardware_name, const char * driver_date, GLuint agp_mode );
|
|
|
|
extern void driInitExtensions( GLcontext * ctx,
|
|
const struct dri_extension * card_extensions, GLboolean enable_imaging );
|
|
|
|
extern void driInitSingleExtension( GLcontext * ctx,
|
|
const struct dri_extension * ext );
|
|
|
|
extern GLboolean driCheckDriDdxDrmVersions2(const char * driver_name,
|
|
const __DRIversion * driActual, const __DRIversion * driExpected,
|
|
const __DRIversion * ddxActual, const __DRIversion * ddxExpected,
|
|
const __DRIversion * drmActual, const __DRIversion * drmExpected);
|
|
|
|
extern GLboolean driCheckDriDdxDrmVersions3(const char * driver_name,
|
|
const __DRIversion * driActual, const __DRIversion * driExpected,
|
|
const __DRIversion * ddxActual, const __DRIutilversion2 * ddxExpected,
|
|
const __DRIversion * drmActual, const __DRIversion * drmExpected);
|
|
|
|
extern GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
|
|
GLint *x, GLint *y,
|
|
GLsizei *width, GLsizei *height );
|
|
|
|
struct __DRIconfigRec {
|
|
__GLcontextModes modes;
|
|
};
|
|
|
|
extern __DRIconfig **
|
|
driCreateConfigs(GLenum fb_format, GLenum fb_type,
|
|
const u_int8_t * depth_bits, const u_int8_t * stencil_bits,
|
|
unsigned num_depth_stencil_bits,
|
|
const GLenum * db_modes, unsigned num_db_modes);
|
|
|
|
const __DRIconfig **driConcatConfigs(__DRIconfig **a, __DRIconfig **b);
|
|
|
|
int
|
|
driGetConfigAttrib(const __DRIconfig *config,
|
|
unsigned int attrib, unsigned int *value);
|
|
int
|
|
driIndexConfigAttrib(const __DRIconfig *config, int index,
|
|
unsigned int *attrib, unsigned int *value);
|
|
|
|
#endif /* DRI_DEBUG_H */
|