From 3336ff91de2aa35277178f39b8d025e324ae5122 Mon Sep 17 00:00:00 2001 From: David Reveman Date: Wed, 30 May 2007 13:08:37 -0400 Subject: [PATCH] Track changes to mesa. --- GL/glx/glxext.c | 8 - GL/glx/glxext.h | 1 - GL/mesa/X/xf86glx_util.h | 7 - GL/mesa/main/Makefile.am | 3 +- GL/mesa/shader/Makefile.am | 13 +- GL/mesa/shader/slang/Makefile.am | 23 +- GL/mesa/swrast/Makefile.am | 3 +- GL/mesa/tnl/Makefile.am | 6 +- GL/symlink-mesa.sh | 415 ++++--------------------------- 9 files changed, 70 insertions(+), 409 deletions(-) diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index b55acb4bb..69c8725d6 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -240,14 +240,6 @@ static int SwapBarrierGone(int screen, XID drawable) static GLboolean errorOccured = GL_FALSE; -/* -** The GL was will call this routine if an error occurs. -*/ -void __glXErrorCallBack(__GLinterface *gc, GLenum code) -{ - errorOccured = GL_TRUE; -} - /* ** Clear the error flag before calling the GL command. */ diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index 5d569899f..c30bb01fd 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -69,7 +69,6 @@ extern void __glXFlushContextCache(void); extern void __glXNoSuchRenderOpcode(GLbyte*); extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*); -extern void __glXErrorCallBack(__GLinterface *gc, GLenum code); extern void __glXClearErrorOccured(void); extern GLboolean __glXErrorOccured(void); extern void __glXResetLargeCommandStatus(__GLXclientState*); diff --git a/GL/mesa/X/xf86glx_util.h b/GL/mesa/X/xf86glx_util.h index 809c1550f..f3b5ee32b 100644 --- a/GL/mesa/X/xf86glx_util.h +++ b/GL/mesa/X/xf86glx_util.h @@ -51,13 +51,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XMESA_USE_PUTPIXEL_MACRO -struct _XMesaImageRec { - int width, height; - char *data; - int bytes_per_line; /* Padded to 32 bits */ - int bits_per_pixel; -}; - extern XMesaImage *XMesaCreateImage(int bitsPerPixel, int width, int height, char *data); extern void XMesaDestroyImage(XMesaImage *image); diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 5996bddaa..b801e239a 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -58,13 +58,14 @@ nodist_libmain_la_SOURCES = accum.c \ matrix.c \ mipmap.c \ mm.c \ - occlude.c \ pixel.c \ points.c \ polygon.c \ + queryobj.c \ rastpos.c \ rbadaptors.c \ renderbuffer.c \ + shaders.c \ state.c \ stencil.c \ texcompress.c \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index e4dd784a8..1a56467fd 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -24,8 +24,13 @@ nodist_libshader_la_SOURCES = \ atifragshader.c \ nvfragparse.c \ nvprogram.c \ - nvvertexec.c \ - nvvertparse.c \ + nvvertparse.c \ + prog_debug.c \ + prog_execute.c \ + prog_instruction.c \ + prog_parameter.c \ + prog_print.c \ program.c \ - shaderobjects.c \ - shaderobjects_3dlabs.c + programopt.c \ + prog_statevars.c \ + shader_api.c diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 6c2c0f373..6fef50450 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -15,23 +15,24 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../.. \ -I$(top_srcdir)/hw/xfree86/os-support -nodist_libslang_la_SOURCES = slang_analyse.c \ - slang_assemble_assignment.c \ - slang_assemble.c \ - slang_assemble_conditional.c \ - slang_assemble_constructor.c \ - slang_assemble_typeinfo.c \ +nodist_libslang_la_SOURCES = slang_builtin.c \ + slang_codegen.c \ slang_compile.c \ slang_compile_function.c \ slang_compile_operation.c \ slang_compile_struct.c \ slang_compile_variable.c \ - slang_execute.c \ - slang_execute_x86.c \ - slang_export.c \ - slang_library_texsample.c \ + slang_emit.c \ + slang_ir.c \ + slang_label.c \ slang_library_noise.c \ slang_link.c \ + slang_log.c \ + slang_mem.c \ slang_preprocess.c \ + slang_print.c \ + slang_simplify.c \ slang_storage.c \ - slang_utility.c + slang_typeinfo.c \ + slang_utility.c \ + slang_vartable.c diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index cca82ff8f..973ba559c 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -20,7 +20,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c \ s_aatriangle.c \ s_accum.c \ s_alpha.c \ - s_arbshader.c \ s_atifragshader.c \ s_bitmap.c \ s_blend.c \ @@ -32,11 +31,11 @@ nodist_libswrast_la_SOURCES = s_aaline.c \ s_drawpix.c \ s_feedback.c \ s_fog.c \ + s_fragprog.c \ s_imaging.c \ s_lines.c \ s_logic.c \ s_masking.c \ - s_nvfragprog.c \ s_points.c \ s_readpix.c \ s_span.c \ diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index b265d7742..9fc318643 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -15,13 +15,9 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I.. \ -I$(top_srcdir)/hw/xfree86/os-support -nodist_libtnl_la_SOURCES = \ +nodist_libtnl_la_SOURCES = t_context.c \ t_draw.c \ - t_context.c \ t_pipeline.c \ - t_vb_arbprogram.c \ - t_vb_arbprogram_sse.c \ - t_vb_arbshader.c \ t_vb_cull.c \ t_vb_fog.c \ t_vb_light.c \ diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh index 5745e369f..0cfe1c9b6 100755 --- a/GL/symlink-mesa.sh +++ b/GL/symlink-mesa.sh @@ -62,425 +62,101 @@ symlink_mesa_glapi() { src_dir src/mesa/glapi dst_dir mesa/glapi - action dispatch.h - action glapi.c - action glapi.h - action glapioffsets.h - action glapitable.h - action glapitemp.h - action glprocs.h - action glthread.c - action glthread.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_main() { src_dir src/mesa/main dst_dir mesa/main - action accum.c - action accum.h - action api_arrayelt.c - action api_arrayelt.h - action api_eval.h - action api_loopback.c - action api_loopback.h - action api_noop.c - action api_noop.h - action api_validate.c - action api_validate.h - action arrayobj.c - action arrayobj.h - action attrib.c - action attrib.h - action bitset.h - action blend.c - action blend.h - action bufferobj.c - action bufferobj.h - action buffers.c - action buffers.h - action clip.c - action clip.h - action colormac.h - action colortab.c - action colortab.h - action config.h - action context.c - action context.h - action convolve.c - action convolve.h - action dd.h - action debug.c - action debug.h - action depth.c - action depth.h - action depthstencil.c - action depthstencil.h - action dlist.c - action dlist.h - action drawpix.c - action drawpix.h - action enable.c - action enable.h - action enums.c - action enums.h - action eval.c - action eval.h - action execmem.c - action extensions.c - action extensions.h - action fbobject.c - action fbobject.h - action feedback.c - action feedback.h - action fog.c - action fog.h - action framebuffer.c - action framebuffer.h - action get.c - action get.h - action getstring.c - action glheader.h - action hash.c - action hash.h - action hint.c - action hint.h - action histogram.c - action histogram.h - action image.c - action image.h - action imports.c - action imports.h - action light.c - action light.h - action lines.c - action lines.h - action macros.h - action matrix.c - action matrix.h - action mipmap.c - action mipmap.h - action mm.c - action mm.h - action mtypes.h - action occlude.c - action occlude.h - action pixel.c - action pixel.h - action points.c - action points.h - action polygon.c - action polygon.h - action rastpos.c - action rastpos.h - action rbadaptors.c - action rbadaptors.h - action renderbuffer.c - action renderbuffer.h - action simple_list.h - action state.c - action state.h - action stencil.c - action stencil.h - action texcompress.c - action texcompress.h - action texcompress_fxt1.c - action texcompress_s3tc.c - action texenvprogram.c - action texenvprogram.h - action texformat.c - action texformat.h - action texformat_tmp.h - action teximage.c - action teximage.h - action texobj.c - action texobj.h - action texrender.c - action texrender.h - action texstate.c - action texstate.h - action texstore.c - action texstore.h - action varray.c - action varray.h - action version.h - action vsnprintf.c - action vtxfmt.c - action vtxfmt.h - action vtxfmt_tmp.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_math() { src_dir src/mesa/math dst_dir mesa/math - action m_clip_tmp.h - action m_copy_tmp.h - action m_debug.h - action m_debug_clip.c - action m_debug_norm.c - action m_debug_util.h - action m_debug_xform.c - action m_dotprod_tmp.h - action m_eval.c - action m_eval.h - action m_matrix.c - action m_matrix.h - action m_norm_tmp.h - action m_trans_tmp.h - action m_translate.c - action m_translate.h - action m_vector.c - action m_vector.h - action m_xform.c - action m_xform.h - action m_xform_tmp.h - action mathmod.h -} - -symlink_mesa_vbo() { - src_dir src/mesa/vbo - dst_dir mesa/vbo - - action vbo.h - action vbo_attrib.h - action vbo_attrib_tmp.h - action vbo_context.c - action vbo_context.h - action vbo_exec.c - action vbo_exec.h - action vbo_exec_api.c - action vbo_exec_array.c - action vbo_exec_draw.c - action vbo_exec_eval.c - action vbo_rebase.c - action vbo_split.c - action vbo_split.h - action vbo_split_copy.c - action vbo_split_inplace.c - action vbo_save.c - action vbo_save.h - action vbo_save_api.c - action vbo_save_draw.c - action vbo_save_loopback.c + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_swrast() { src_dir src/mesa/swrast dst_dir mesa/swrast - action s_aaline.c - action s_aaline.h - action s_aalinetemp.h - action s_aatriangle.c - action s_aatriangle.h - action s_aatritemp.h - action s_accum.c - action s_accum.h - action s_alpha.c - action s_alpha.h - action s_arbshader.c - action s_arbshader.h - action s_atifragshader.c - action s_atifragshader.h - action s_bitmap.c - action s_blend.c - action s_blend.h - action s_blit.c - action s_buffers.c - action s_context.c - action s_context.h - action s_copypix.c - action s_depth.c - action s_depth.h - action s_drawpix.c - action s_drawpix.h - action s_feedback.c - action s_feedback.h - action s_fog.c - action s_fog.h - action s_imaging.c - action s_lines.c - action s_lines.h - action s_linetemp.h - action s_logic.c - action s_logic.h - action s_masking.c - action s_masking.h - action s_nvfragprog.c - action s_nvfragprog.h - action s_points.c - action s_points.h - action s_pointtemp.h - action s_readpix.c - action s_span.c - action s_span.h - action s_spantemp.h - action s_stencil.c - action s_stencil.h - action s_texcombine.c - action s_texcombine.h - action s_texfilter.c - action s_texfilter.h - action s_texstore.c - action s_triangle.c - action s_triangle.h - action s_trispan.h - action s_tritemp.h - action s_zoom.c - action s_zoom.h - action swrast.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_ss() { src_dir src/mesa/swrast_setup dst_dir mesa/swrast_setup - action ss_context.c - action ss_context.h - action ss_triangle.c - action ss_triangle.h - action ss_tritmp.h - action ss_vb.h - action swrast_setup.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_tnl() { src_dir src/mesa/tnl dst_dir mesa/tnl - action t_context.c - action t_draw.c - action t_context.h - action t_pipeline.c - action t_pipeline.h - action t_vb_arbprogram.c - action t_vb_arbprogram.h - action t_vb_arbprogram_sse.c - action t_vb_arbshader.c - action t_vb_cliptmp.h - action t_vb_cull.c - action t_vb_fog.c - action t_vb_light.c - action t_vb_lighttmp.h - action t_vb_normals.c - action t_vb_points.c - action t_vb_program.c - action t_vb_render.c - action t_vb_rendertmp.h - action t_vb_texgen.c - action t_vb_texmat.c - action t_vb_vertex.c - action t_vertex.c - action t_vertex.h - action t_vertex_generic.c - action t_vertex_sse.c - action t_vp_build.c - action t_vp_build.h - action tnl.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_shader() { src_dir src/mesa/shader dst_dir mesa/shader - action arbprogparse.c - action arbprogparse.h - action arbprogram.c - action arbprogram.h - action arbprogram_syn.h - action atifragshader.c - action atifragshader.h - action nvfragparse.c - action nvfragparse.h - action nvprogram.c - action nvprogram.h - action nvvertexec.c - action nvvertexec.h - action nvvertparse.c - action nvvertparse.h - action program.c - action program.h - action program_instruction.h - action shaderobjects.c - action shaderobjects.h - action shaderobjects_3dlabs.c - action shaderobjects_3dlabs.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_shader_grammar() { src_dir src/mesa/shader/grammar dst_dir mesa/shader/grammar - action grammar.c - action grammar.h - action grammar_syn.h - action grammar_mesa.c - action grammar_mesa.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_shader_slang() { src_dir src/mesa/shader/slang dst_dir mesa/shader/slang - action slang_analyse.c - action slang_analyse.h - action slang_assemble.c - action slang_assemble.h - action slang_assemble_assignment.c - action slang_assemble_assignment.h - action slang_assemble_conditional.c - action slang_assemble_conditional.h - action slang_assemble_constructor.c - action slang_assemble_constructor.h - action slang_assemble_typeinfo.c - action slang_assemble_typeinfo.h - action slang_compile.c - action slang_compile.h - action slang_compile_function.c - action slang_compile_function.h - action slang_compile_operation.c - action slang_compile_operation.h - action slang_compile_struct.c - action slang_compile_struct.h - action slang_compile_variable.c - action slang_compile_variable.h - action slang_execute.c - action slang_execute.h - action slang_execute_x86.c - action slang_export.c - action slang_export.h - action slang_library_noise.c - action slang_library_noise.h - action slang_library_texsample.c - action slang_library_texsample.h - action slang_link.c - action slang_link.h - action slang_mesa.h - action slang_preprocess.c - action slang_preprocess.h - action slang_storage.c - action slang_storage.h - action slang_utility.c - action slang_utility.h - action traverse_wrap.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } symlink_mesa_shader_slang_library() { src_dir src/mesa/shader/slang/library dst_dir mesa/shader/slang/library - action slang_builtin_vec4_gc.h - action slang_common_builtin_gc.h - action slang_core_gc.h - action slang_fragment_builtin_gc.h - action slang_shader_syn.h - action slang_pp_directives_syn.h - action slang_pp_expression_syn.h - action slang_pp_version_syn.h - action slang_vertex_builtin_gc.h + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done } +symlink_mesa_vbo() { + src_dir src/mesa/vbo + dst_dir mesa/vbo + + for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do + action `basename $src` + done +} + symlink_mesa_x() { src_dir src/mesa/drivers/x11 dst_dir mesa/X @@ -492,6 +168,8 @@ symlink_mesa_x() { action xm_api.c action xm_buffer.c action xm_dd.c + action xm_image.c + action xm_image.h action xm_line.c action xm_span.c action xm_tri.c @@ -527,7 +205,6 @@ symlink_mesa_x8664() { symlink_mesa() { symlink_mesa_main symlink_mesa_math - symlink_mesa_vbo symlink_mesa_swrast symlink_mesa_ss symlink_mesa_tnl @@ -539,6 +216,7 @@ symlink_mesa() { symlink_mesa_glapi symlink_mesa_ppc symlink_mesa_sparc + symlink_mesa_vbo symlink_mesa_x86 symlink_mesa_x8664 } @@ -549,9 +227,6 @@ symlink_glx() { dst_dir glx action indirect_size.h - - src_dir src/mesa/drivers/dri/common - action glcontextmodes.c action glcontextmodes.h @@ -613,9 +288,9 @@ action() { } usage() { - echo symlink.sh src-dir dst-dir - echo src-dir: the xc directory of the monolithic source tree - echo dst-dir: the modular source tree containing proto, app, lib, ... + echo symlink-mesa.sh src-dir dst-dir + echo src-dir: the Mesa source directory + echo dst-dir: the GL subdirectory of the Xserver modular tree } # Check commandline args