Makefile | 2 bin/mklib | 20 - configs/darwin | 4 configure.ac | 11 docs/relnotes-7.6.1.html | 11 docs/relnotes-7.7.html | 10 include/GL/gl_mangle.h | 43 +++ progs/demos/readpix.c | 9 progs/demos/textures.c | 2 progs/glsl/shtest.c | 2 progs/glsl/texaaline.c | 6 progs/perf/genmipmap.c | 6 progs/redbook/aaindex.c | 8 progs/redbook/aapoly.c | 8 progs/redbook/aargb.c | 8 progs/redbook/accanti.c | 8 progs/redbook/accpersp.c | 14 - progs/redbook/alpha.c | 6 progs/redbook/alpha3D.c | 8 progs/redbook/anti.c | 6 progs/redbook/bezcurve.c | 8 progs/redbook/bezmesh.c | 8 progs/redbook/checker.c | 8 progs/redbook/clip.c | 8 progs/redbook/colormat.c | 10 progs/redbook/cube.c | 8 progs/redbook/depthcue.c | 6 progs/redbook/dof.c | 12 - progs/redbook/double.c | 12 - progs/redbook/drawf.c | 8 progs/redbook/feedback.c | 14 - progs/redbook/fog.c | 10 progs/redbook/fogindex.c | 6 progs/redbook/font.c | 12 - progs/redbook/hello.c | 4 progs/redbook/image.c | 12 - progs/redbook/light.c | 8 progs/redbook/lines.c | 8 progs/redbook/list.c | 6 progs/redbook/material.c | 6 progs/redbook/mipmap.c | 8 progs/redbook/model.c | 10 progs/redbook/movelight.c | 10 progs/redbook/nurbs.c | 6 progs/redbook/pickdepth.c | 12 - progs/redbook/picksquare.c | 14 - progs/redbook/plane.c | 8 progs/redbook/planet.c | 8 progs/redbook/polyoff.c | 25 -- progs/redbook/polys.c | 4 progs/redbook/quadric.c | 10 progs/redbook/robot.c | 8 progs/redbook/sccolorlight.c | 6 progs/redbook/scene.c | 6 progs/redbook/scenebamb.c | 6 progs/redbook/sceneflat.c | 6 progs/redbook/select.c | 18 - progs/redbook/smooth.c | 10 progs/redbook/stencil.c | 6 progs/redbook/stroke.c | 8 progs/redbook/surface.c | 14 - progs/redbook/teaambient.c | 6 progs/redbook/teapots.c | 8 progs/redbook/tess.c | 18 - progs/redbook/tesswind.c | 18 - progs/redbook/texbind.c | 10 progs/redbook/texgen.c | 10 progs/redbook/texprox.c | 6 progs/redbook/texsub.c | 10 progs/redbook/texturesurf.c | 8 progs/redbook/torus.c | 6 progs/redbook/trim.c | 12 - progs/redbook/unproject.c | 8 progs/redbook/varray.c | 14 - progs/redbook/wrap.c | 10 progs/tests/bug_texstore_i8.c | 2 progs/tests/crossbar.c | 2 progs/tests/cva.c | 8 progs/tests/fptest1.c | 2 progs/tests/invert.c | 2 progs/tests/packedpixels.c | 2 progs/tests/quads.c | 3 progs/tests/scissor-viewport.c | 4 progs/tests/scissor.c | 4 progs/tests/stencilwrap.c | 2 progs/tests/tex1d.c | 2 progs/tests/unfilledclip.c | 2 progs/tests/vpeval.c | 10 progs/trivial/clear-fbo-tex.c | 4 progs/trivial/createwin.c | 2 progs/trivial/dlist-begin-call-end.c | 2 progs/trivial/draw2arrays.c | 2 progs/trivial/drawarrays.c | 2 progs/trivial/tri-blend-max.c | 6 progs/trivial/tri-blend-min.c | 6 progs/trivial/tri-blend-revsub.c | 6 progs/trivial/tri-blend-sub.c | 6 progs/trivial/tri-blend.c | 6 progs/trivial/tri-fbo-tex.c | 3 progs/trivial/tri-fp.c | 2 progs/trivial/tri-logicop-none.c | 2 progs/trivial/tri-logicop-xor.c | 2 progs/trivial/tri-z.c | 6 progs/trivial/vbo-drawarrays.c | 2 progs/trivial/vbo-noninterleaved.c | 4 progs/xdemos/corender.c | 2 progs/xdemos/glxinfo.c | 4 src/gallium/state_trackers/xorg/xorg_driver.c | 66 +++-- src/gallium/state_trackers/xorg/xorg_exa.c | 31 +- src/gallium/winsys/drm/intel/gem/intel_drm_api.c | 1 src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c | 9 src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h | 78 ++++-- src/gallium/winsys/drm/vmware/xorg/vmw_driver.h | 11 src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c | 56 ++++ src/gallium/winsys/drm/vmware/xorg/vmw_video.c | 21 + src/gallium/winsys/xlib/Makefile | 8 src/glut/glx/glut_menu.c | 5 src/mesa/drivers/common/meta.c | 6 src/mesa/drivers/dri/common/dri_util.c | 2 src/mesa/drivers/dri/i810/i810tris.c | 3 src/mesa/drivers/dri/i915/i915_texstate.c | 18 - src/mesa/drivers/dri/i965/brw_cc.c | 4 src/mesa/drivers/dri/i965/brw_vs_emit.c | 14 + src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 src/mesa/drivers/dri/intel/intel_buffers.c | 11 src/mesa/drivers/dri/intel/intel_context.c | 2 src/mesa/drivers/dri/mach64/mach64_tris.c | 3 src/mesa/drivers/dri/mga/mgatris.c | 3 src/mesa/drivers/dri/r128/r128_tris.c | 3 src/mesa/drivers/dri/r200/Makefile | 2 src/mesa/drivers/dri/r200/radeon_bo.c | 1 src/mesa/drivers/dri/r200/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r200/radeon_cs.c | 1 src/mesa/drivers/dri/r200/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r300/Makefile | 2 src/mesa/drivers/dri/r300/r300_texstate.c | 6 src/mesa/drivers/dri/r300/radeon_bo.c | 1 src/mesa/drivers/dri/r300/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r300/radeon_cs.c | 1 src/mesa/drivers/dri/r300/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r600/Makefile | 2 src/mesa/drivers/dri/r600/r600_cmdbuf.c | 216 +++++++++--------- src/mesa/drivers/dri/r600/r600_cmdbuf.h | 16 - src/mesa/drivers/dri/r600/r700_state.c | 13 - src/mesa/drivers/dri/r600/radeon_bo.c | 1 src/mesa/drivers/dri/r600/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r600/radeon_cs.c | 1 src/mesa/drivers/dri/r600/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/radeon/Makefile | 2 src/mesa/drivers/dri/radeon/radeon_bo.c | 110 +++++++++ src/mesa/drivers/dri/radeon/radeon_bo_drm.h | 209 ++--------------- src/mesa/drivers/dri/radeon/radeon_bo_int_drm.h | 45 +++ src/mesa/drivers/dri/radeon/radeon_bo_legacy.c | 83 +++--- src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 3 src/mesa/drivers/dri/radeon/radeon_common_context.h | 3 src/mesa/drivers/dri/radeon/radeon_cs.c | 95 +++++++ src/mesa/drivers/dri/radeon/radeon_cs_drm.h | 215 ++++------------- src/mesa/drivers/dri/radeon/radeon_cs_int_drm.h | 66 +++++ src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 72 +++--- src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c | 66 +++-- src/mesa/drivers/dri/radeon/radeon_dma.c | 1 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 5 src/mesa/drivers/dri/radeon/radeon_span.c | 3 src/mesa/drivers/dri/radeon/radeon_texture.c | 14 + src/mesa/drivers/dri/savage/savageioctl.c | 2 src/mesa/drivers/dri/savage/savagetris.c | 3 src/mesa/drivers/dri/sis/sis_clear.c | 1 src/mesa/drivers/dri/sis/sis_tris.c | 3 src/mesa/drivers/dri/unichrome/via_ioctl.c | 1 src/mesa/drivers/dri/unichrome/via_tris.c | 3 src/mesa/main/compiler.h | 2 src/mesa/main/dlopen.c | 14 - src/mesa/main/version.h | 2 src/mesa/shader/prog_print.c | 8 src/mesa/shader/slang/slang_compile.c | 24 +- src/mesa/shader/slang/slang_compile_operation.c | 1 src/mesa/state_tracker/st_atom_shader.c | 2 src/mesa/state_tracker/st_cb_bufferobjects.c | 16 - src/mesa/state_tracker/st_draw.c | 4 src/mesa/state_tracker/st_gen_mipmap.c | 3 src/mesa/state_tracker/st_program.c | 2 src/mesa/swrast/s_atifragshader.c | 2 src/mesa/swrast/s_triangle.c | 6 src/mesa/swrast_setup/ss_tritmp.h | 6 src/mesa/tnl_dd/t_dd_dmatmp.h | 9 src/mesa/tnl_dd/t_dd_dmatmp2.h | 11 src/mesa/tnl_dd/t_dd_tritmp.h | 4 src/mesa/x86/rtasm/x86sse.c | 2 188 files changed, 1478 insertions(+), 1098 deletions(-)
New commits: commit f42c861f029ae6ae469ae4685c6d5b25b7b34b68 Author: Tom Fogal <tfo...@alumni.unh.edu> Date: Wed Dec 23 11:24:52 2009 -0700 Regenerate gl_mangle.h. Signed-off-by: Brian Paul <bri...@vmware.com> diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h index 59f6149..b292840 100644 --- a/include/GL/gl_mangle.h +++ b/include/GL/gl_mangle.h @@ -30,6 +30,7 @@ /*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */ #define glAccum MANGLE(Accum) +#define glActiveProgramEXT MANGLE(ActiveProgramEXT) #define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT) #define glActiveTextureARB MANGLE(ActiveTextureARB) #define glActiveTexture MANGLE(ActiveTexture) @@ -60,6 +61,7 @@ #define glBeginTransformFeedback MANGLE(BeginTransformFeedback) #define glBeginTransformFeedbackNV MANGLE(BeginTransformFeedbackNV) #define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT) +#define glBeginVideoCaptureNV MANGLE(BeginVideoCaptureNV) #define glBindAttribLocationARB MANGLE(BindAttribLocationARB) #define glBindAttribLocation MANGLE(BindAttribLocation) #define glBindBufferARB MANGLE(BindBufferARB) @@ -93,6 +95,8 @@ #define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE) #define glBindVertexArray MANGLE(BindVertexArray) #define glBindVertexShaderEXT MANGLE(BindVertexShaderEXT) +#define glBindVideoCaptureStreamBufferNV MANGLE(BindVideoCaptureStreamBufferNV) +#define glBindVideoCaptureStreamTextureNV MANGLE(BindVideoCaptureStreamTextureNV) #define glBinormal3bEXT MANGLE(Binormal3bEXT) #define glBinormal3bvEXT MANGLE(Binormal3bvEXT) #define glBinormal3dEXT MANGLE(Binormal3dEXT) @@ -126,6 +130,7 @@ #define glBlendFuncSeparate MANGLE(BlendFuncSeparate) #define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT) #define glBlitFramebuffer MANGLE(BlitFramebuffer) +#define glBufferAddressRangeNV MANGLE(BufferAddressRangeNV) #define glBufferDataARB MANGLE(BufferDataARB) #define glBufferData MANGLE(BufferData) #define glBufferParameteriAPPLE MANGLE(BufferParameteriAPPLE) @@ -202,6 +207,7 @@ #define glColor4uiv MANGLE(Color4uiv) #define glColor4us MANGLE(Color4us) #define glColor4usv MANGLE(Color4usv) +#define glColorFormatNV MANGLE(ColorFormatNV) #define glColorFragmentOp1ATI MANGLE(ColorFragmentOp1ATI) #define glColorFragmentOp2ATI MANGLE(ColorFragmentOp2ATI) #define glColorFragmentOp3ATI MANGLE(ColorFragmentOp3ATI) @@ -276,6 +282,7 @@ #define glCopyConvolutionFilter1D MANGLE(CopyConvolutionFilter1D) #define glCopyConvolutionFilter2DEXT MANGLE(CopyConvolutionFilter2DEXT) #define glCopyConvolutionFilter2D MANGLE(CopyConvolutionFilter2D) +#define glCopyImageSubDataNV MANGLE(CopyImageSubDataNV) #define glCopyMultiTexImage1DEXT MANGLE(CopyMultiTexImage1DEXT) #define glCopyMultiTexImage2DEXT MANGLE(CopyMultiTexImage2DEXT) #define glCopyMultiTexSubImage1DEXT MANGLE(CopyMultiTexSubImage1DEXT) @@ -302,6 +309,7 @@ #define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB) #define glCreateShader MANGLE(CreateShader) #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB) +#define glCreateShaderProgramEXT MANGLE(CreateShaderProgramEXT) #define glCullFace MANGLE(CullFace) #define glCullParameterdvEXT MANGLE(CullParameterdvEXT) #define glCullParameterfvEXT MANGLE(CullParameterfvEXT) @@ -379,6 +387,7 @@ #define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT) #define glDrawRangeElements MANGLE(DrawRangeElements) #define glDrawTransformFeedbackNV MANGLE(DrawTransformFeedbackNV) +#define glEdgeFlagFormatNV MANGLE(EdgeFlagFormatNV) #define glEdgeFlag MANGLE(EdgeFlag) #define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT) #define glEdgeFlagPointerListIBM MANGLE(EdgeFlagPointerListIBM) @@ -408,6 +417,7 @@ #define glEndTransformFeedback MANGLE(EndTransformFeedback) #define glEndTransformFeedbackNV MANGLE(EndTransformFeedbackNV) #define glEndVertexShaderEXT MANGLE(EndVertexShaderEXT) +#define glEndVideoCaptureNV MANGLE(EndVideoCaptureNV) #define glEvalCoord1d MANGLE(EvalCoord1d) #define glEvalCoord1dv MANGLE(EvalCoord1dv) #define glEvalCoord1f MANGLE(EvalCoord1f) @@ -445,6 +455,7 @@ #define glFogCoorddv MANGLE(FogCoorddv) #define glFogCoordfEXT MANGLE(FogCoordfEXT) #define glFogCoordf MANGLE(FogCoordf) +#define glFogCoordFormatNV MANGLE(FogCoordFormatNV) #define glFogCoordfvEXT MANGLE(FogCoordfvEXT) #define glFogCoordfv MANGLE(FogCoordfv) #define glFogCoordhNV MANGLE(FogCoordhNV) @@ -544,6 +555,7 @@ #define glGetBufferParameteri64v MANGLE(GetBufferParameteri64v) #define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB) #define glGetBufferParameteriv MANGLE(GetBufferParameteriv) +#define glGetBufferParameterui64vNV MANGLE(GetBufferParameterui64vNV) #define glGetBufferPointervARB MANGLE(GetBufferPointervARB) #define glGetBufferPointerv MANGLE(GetBufferPointerv) #define glGetBufferSubDataARB MANGLE(GetBufferSubDataARB) @@ -609,6 +621,8 @@ #define glGetInteger64v MANGLE(GetInteger64v) #define glGetIntegerIndexedvEXT MANGLE(GetIntegerIndexedvEXT) #define glGetIntegeri_v MANGLE(GetIntegeri_v) +#define glGetIntegerui64i_vNV MANGLE(GetIntegerui64i_vNV) +#define glGetIntegerui64vNV MANGLE(GetIntegerui64vNV) #define glGetIntegerv MANGLE(GetIntegerv) #define glGetInvariantBooleanvEXT MANGLE(GetInvariantBooleanvEXT) #define glGetInvariantFloatvEXT MANGLE(GetInvariantFloatvEXT) @@ -651,6 +665,7 @@ #define glGetMultiTexParameterIuivEXT MANGLE(GetMultiTexParameterIuivEXT) #define glGetMultiTexParameterivEXT MANGLE(GetMultiTexParameterivEXT) #define glGetNamedBufferParameterivEXT MANGLE(GetNamedBufferParameterivEXT) +#define glGetNamedBufferParameterui64vNV MANGLE(GetNamedBufferParameterui64vNV) #define glGetNamedBufferPointervEXT MANGLE(GetNamedBufferPointervEXT) #define glGetNamedBufferSubDataEXT MANGLE(GetNamedBufferSubDataEXT) #define glGetNamedFramebufferAttachmentParameterivEXT MANGLE(GetNamedFramebufferAttachmentParameterivEXT) @@ -761,6 +776,7 @@ #define glGetUniformLocationARB MANGLE(GetUniformLocationARB) #define glGetUniformLocation MANGLE(GetUniformLocation) #define glGetUniformOffsetEXT MANGLE(GetUniformOffsetEXT) +#define glGetUniformui64vNV MANGLE(GetUniformui64vNV) #define glGetUniformuivEXT MANGLE(GetUniformuivEXT) #define glGetUniformuiv MANGLE(GetUniformuiv) #define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI) @@ -788,6 +804,10 @@ #define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB) #define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv) #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV) +#define glGetVideoCaptureivNV MANGLE(GetVideoCaptureivNV) +#define glGetVideoCaptureStreamdvNV MANGLE(GetVideoCaptureStreamdvNV) +#define glGetVideoCaptureStreamfvNV MANGLE(GetVideoCaptureStreamfvNV) +#define glGetVideoCaptureStreamivNV MANGLE(GetVideoCaptureStreamivNV) #define glGetVideoi64vNV MANGLE(GetVideoi64vNV) #define glGetVideoivNV MANGLE(GetVideoivNV) #define glGetVideoui64vNV MANGLE(GetVideoui64vNV) @@ -812,6 +832,7 @@ #define glIndexd MANGLE(Indexd) #define glIndexdv MANGLE(Indexdv) #define glIndexf MANGLE(Indexf) +#define glIndexFormatNV MANGLE(IndexFormatNV) #define glIndexFuncEXT MANGLE(IndexFuncEXT) #define glIndexfv MANGLE(Indexfv) #define glIndexi MANGLE(Indexi) @@ -832,6 +853,7 @@ #define glIsAsyncMarkerSGIX MANGLE(IsAsyncMarkerSGIX) #define glIsBufferARB MANGLE(IsBufferARB) #define glIsBuffer MANGLE(IsBuffer) +#define glIsBufferResidentNV MANGLE(IsBufferResidentNV) #define glIsEnabledi MANGLE(IsEnabledi) #define glIsEnabledIndexedEXT MANGLE(IsEnabledIndexedEXT) #define glIsEnabled MANGLE(IsEnabled) @@ -840,6 +862,7 @@ #define glIsFramebufferEXT MANGLE(IsFramebufferEXT) #define glIsFramebuffer MANGLE(IsFramebuffer) #define glIsList MANGLE(IsList) +#define glIsNamedBufferResidentNV MANGLE(IsNamedBufferResidentNV) #define glIsObjectBufferATI MANGLE(IsObjectBufferATI) #define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV) #define glIsProgramARB MANGLE(IsProgramARB) @@ -888,6 +911,8 @@ #define glLoadTransposeMatrixf MANGLE(LoadTransposeMatrixf) #define glLockArraysEXT MANGLE(LockArraysEXT) #define glLogicOp MANGLE(LogicOp) +#define glMakeBufferNonResidentNV MANGLE(MakeBufferNonResidentNV) +#define glMakeBufferResidentNV MANGLE(MakeBufferResidentNV) #define glMap1d MANGLE(Map1d) #define glMap1f MANGLE(Map1f) #define glMap2d MANGLE(Map2d) @@ -1060,6 +1085,8 @@ #define glNamedFramebufferTextureEXT MANGLE(NamedFramebufferTextureEXT) #define glNamedFramebufferTextureFaceEXT MANGLE(NamedFramebufferTextureFaceEXT) #define glNamedFramebufferTextureLayerEXT MANGLE(NamedFramebufferTextureLayerEXT) +#define glNamedMakeBufferNonResidentNV MANGLE(NamedMakeBufferNonResidentNV) +#define glNamedMakeBufferResidentNV MANGLE(NamedMakeBufferResidentNV) #define glNamedProgramLocalParameter4dEXT MANGLE(NamedProgramLocalParameter4dEXT) #define glNamedProgramLocalParameter4dvEXT MANGLE(NamedProgramLocalParameter4dvEXT) #define glNamedProgramLocalParameter4fEXT MANGLE(NamedProgramLocalParameter4fEXT) @@ -1091,6 +1118,7 @@ #define glNormal3iv MANGLE(Normal3iv) #define glNormal3s MANGLE(Normal3s) #define glNormal3sv MANGLE(Normal3sv) +#define glNormalFormatNV MANGLE(NormalFormatNV) #define glNormalPointerEXT MANGLE(NormalPointerEXT) #define glNormalPointerListIBM MANGLE(NormalPointerListIBM) #define glNormalPointer MANGLE(NormalPointer) @@ -1234,6 +1262,8 @@ #define glProgramUniformMatrix4fvEXT MANGLE(ProgramUniformMatrix4fvEXT) #define glProgramUniformMatrix4x2fvEXT MANGLE(ProgramUniformMatrix4x2fvEXT) #define glProgramUniformMatrix4x3fvEXT MANGLE(ProgramUniformMatrix4x3fvEXT) +#define glProgramUniformui64NV MANGLE(ProgramUniformui64NV) +#define glProgramUniformui64vNV MANGLE(ProgramUniformui64vNV) #define glProgramVertexLimitNV MANGLE(ProgramVertexLimitNV) #define glProvokingVertexEXT MANGLE(ProvokingVertexEXT) #define glProvokingVertex MANGLE(ProvokingVertex) @@ -1362,6 +1392,7 @@ #define glSecondaryColor3us MANGLE(SecondaryColor3us) #define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT) #define glSecondaryColor3usv MANGLE(SecondaryColor3usv) +#define glSecondaryColorFormatNV MANGLE(SecondaryColorFormatNV) #define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT) #define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM) #define glSecondaryColorPointer MANGLE(SecondaryColorPointer) @@ -1475,6 +1506,7 @@ #define glTexCoord4iv MANGLE(TexCoord4iv) #define glTexCoord4s MANGLE(TexCoord4s) #define glTexCoord4sv MANGLE(TexCoord4sv) +#define glTexCoordFormatNV MANGLE(TexCoordFormatNV) #define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT) #define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM) #define glTexCoordPointer MANGLE(TexCoordPointer) @@ -1513,6 +1545,7 @@ #define glTexSubImage3DEXT MANGLE(TexSubImage3DEXT) #define glTexSubImage3D MANGLE(TexSubImage3D) #define glTexSubImage4DSGIS MANGLE(TexSubImage4DSGIS) +#define glTextureBarrierNV MANGLE(TextureBarrierNV) #define glTextureBufferEXT MANGLE(TextureBufferEXT) #define glTextureColorMaskSGIS MANGLE(TextureColorMaskSGIS) #define glTextureImage1DEXT MANGLE(TextureImage1DEXT) @@ -1601,6 +1634,8 @@ #define glUniformMatrix4fv MANGLE(UniformMatrix4fv) #define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv) #define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv) +#define glUniformui64NV MANGLE(Uniformui64NV) +#define glUniformui64vNV MANGLE(Uniformui64vNV) #define glUnlockArraysEXT MANGLE(UnlockArraysEXT) #define glUnmapBufferARB MANGLE(UnmapBufferARB) #define glUnmapBuffer MANGLE(UnmapBuffer) @@ -1609,6 +1644,7 @@ #define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI) #define glUseProgram MANGLE(UseProgram) #define glUseProgramObjectARB MANGLE(UseProgramObjectARB) +#define glUseShaderProgramEXT MANGLE(UseShaderProgramEXT) #define glValidateProgramARB MANGLE(ValidateProgramARB) #define glValidateProgram MANGLE(ValidateProgram) #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI) @@ -1762,6 +1798,7 @@ #define glVertexAttrib4usv MANGLE(VertexAttrib4usv) #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI) #define glVertexAttribDivisorARB MANGLE(VertexAttribDivisorARB) +#define glVertexAttribFormatNV MANGLE(VertexAttribFormatNV) #define glVertexAttribI1iEXT MANGLE(VertexAttribI1iEXT) #define glVertexAttribI1i MANGLE(VertexAttribI1i) #define glVertexAttribI1ivEXT MANGLE(VertexAttribI1ivEXT) @@ -1802,6 +1839,7 @@ #define glVertexAttribI4uiv MANGLE(VertexAttribI4uiv) #define glVertexAttribI4usvEXT MANGLE(VertexAttribI4usvEXT) #define glVertexAttribI4usv MANGLE(VertexAttribI4usv) +#define glVertexAttribIFormatNV MANGLE(VertexAttribIFormatNV) #define glVertexAttribIPointerEXT MANGLE(VertexAttribIPointerEXT) #define glVertexAttribIPointer MANGLE(VertexAttribIPointer) #define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB) @@ -1827,6 +1865,7 @@ #define glVertexBlendARB MANGLE(VertexBlendARB) #define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI) #define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI) +#define glVertexFormatNV MANGLE(VertexFormatNV) #define glVertexPointerEXT MANGLE(VertexPointerEXT) #define glVertexPointerListIBM MANGLE(VertexPointerListIBM) #define glVertexPointer MANGLE(VertexPointer) @@ -1868,6 +1907,10 @@ #define glVertexWeighthNV MANGLE(VertexWeighthNV) #define glVertexWeighthvNV MANGLE(VertexWeighthvNV) #define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT) +#define glVideoCaptureNV MANGLE(VideoCaptureNV) +#define glVideoCaptureStreamParameterdvNV MANGLE(VideoCaptureStreamParameterdvNV) +#define glVideoCaptureStreamParameterfvNV MANGLE(VideoCaptureStreamParameterfvNV) +#define glVideoCaptureStreamParameterivNV MANGLE(VideoCaptureStreamParameterivNV) #define glViewport MANGLE(Viewport) #define glWaitSync MANGLE(WaitSync) #define glWeightbvARB MANGLE(WeightbvARB) commit 8e8502bc6352227afda370cfeeb1a49b128df752 Author: Maarten Maathuis <madman2...@gmail.com> Date: Sun Dec 20 05:03:03 2009 -0800 gallium: only create pipe buffer when size is nonzero - This fixes a crash upon starting spring (a rts engine/game). Signed-off-by: Maarten Maathuis <madman2...@gmail.com> diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 63196af..494a3a9 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -170,15 +170,19 @@ st_bufferobj_data(GLcontext *ctx, pipe_buffer_reference( &st_obj->buffer, NULL ); - st_obj->buffer = pipe_buffer_create( pipe->screen, 32, buffer_usage, size ); + if (size != 0) { + st_obj->buffer = pipe_buffer_create(pipe->screen, 32, buffer_usage, size); - if (!st_obj->buffer) { - return GL_FALSE; + if (!st_obj->buffer) { + return GL_FALSE; + } + + if (data) + st_no_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, 0, + size, data); + return GL_TRUE; } - if (data) - st_no_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, 0, - size, data); return GL_TRUE; } commit b5ddc7821a334177ff3f6c0ea3a5c24245ad194c Author: Brian Paul <bri...@vmware.com> Date: Tue Dec 22 13:28:39 2009 -0700 mesa: fix binary() function, printf format string Need to use the constant 1ULL and 0xllx format string. This fixes incorrect results and a NULL pointer/parameter bug. diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c index 52c102c..9f9789e 100644 --- a/src/mesa/shader/prog_print.c +++ b/src/mesa/shader/prog_print.c @@ -821,8 +821,10 @@ _mesa_print_program(const struct gl_program *prog) /** - * Return binary representation of value (as a string). + * Return binary representation of 64-bit value (as a string). * Insert a comma to separate each group of 8 bits. + * Note we return a pointer to local static storage so this is not + * re-entrant, etc. * XXX move to imports.[ch] if useful elsewhere. */ static const char * @@ -831,7 +833,7 @@ binary(GLbitfield64 val) static char buf[80]; GLint i, len = 0; for (i = 63; i >= 0; --i) { - if (val & (1 << i)) + if (val & (1ULL << i)) buf[len++] = '1'; else if (len > 0 || i == 0) buf[len++] = '0'; @@ -855,7 +857,7 @@ _mesa_fprint_program_parameters(FILE *f, _mesa_fprintf(f, "InputsRead: 0x%x (0b%s)\n", prog->InputsRead, binary(prog->InputsRead)); - _mesa_fprintf(f, "OutputsWritten: 0x%x (0b%s)\n", + _mesa_fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n", prog->OutputsWritten, binary(prog->OutputsWritten)); _mesa_fprintf(f, "NumInstructions=%d\n", prog->NumInstructions); _mesa_fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries); commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73 Author: Vinson Lee <v...@vmware.com> Date: Tue Dec 22 00:54:34 2009 -0800 progs/tests: Fix build. diff --git a/progs/tests/packedpixels.c b/progs/tests/packedpixels.c index 1e70a31..34df955 100644 --- a/progs/tests/packedpixels.c +++ b/progs/tests/packedpixels.c @@ -273,7 +273,6 @@ Draw(void) glTranslatef(2, (i + 1) * (h + 2), 0); glRasterPos2i(8, 6); sprintf(s, "Internal Texture Format [f/F]: %s (%d of %lu)", - IntFormats[CurFormat].name, CurFormat + 1, NUM_INT_FORMATS); IntFormats[CurFormat].name, CurFormat + 1, (unsigned long) NUM_INT_FORMATS); PrintString(s); glPopMatrix(); commit 82184970d3aee822d945af7d4902359f28f7057f Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Dec 21 18:32:32 2009 -0800 Add MD5 checksums for 7.6.1 release diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html index a41bcee..19d5404 100644 --- a/docs/relnotes-7.6.1.html +++ b/docs/relnotes-7.6.1.html @@ -26,7 +26,15 @@ for DRI hardware acceleration. <h2>MD5 checksums</h2> <pre> -tbd +e80fabad2e3eb7990adae773d6aeacba MesaLib-7.6.1.tar.gz +7db4617e9e10ad3aca1b64339fd71b7d MesaLib-7.6.1.tar.bz2 +dd3275dbf9833480d2e92d0c69b22abd MesaLib-7.6.1.zip +f7fdcfe3c0f363e571c60f02f74368fb MesaDemos-7.6.1.tar.gz +a4226f06732a02556fcf6be290b86dff MesaDemos-7.6.1.tar.bz2 +849425f356bd940726cebedfa79de176 MesaDemos-7.6.1.zip +d40cc7c5e337a85b674e27a8e494f52f MesaGLUT-7.6.1.tar.gz +ca9aecb91f05b1da9fd7d5eeb19d47d7 MesaGLUT-7.6.1.tar.bz2 +23fad8398004c977a1d8953079b72ca6 MesaGLUT-7.6.1.zip </pre> commit 6ffed19993ab622e0d63776420bd8c6fc6c646f3 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Dec 21 18:30:35 2009 -0800 Add MD5 checksums for 7.7 release diff --git a/docs/relnotes-7.7.html b/docs/relnotes-7.7.html index 8c8f763..de98023 100644 --- a/docs/relnotes-7.7.html +++ b/docs/relnotes-7.7.html @@ -28,7 +28,15 @@ for DRI hardware acceleration. <h2>MD5 checksums</h2> <pre> -tbd +395c9516edf1ad54b0934d8db15557bf MesaLib-7.7.tar.gz +e3fa64a1508bc23dd9de9dd2cea7cfb1 MesaLib-7.7.tar.bz2 +e54903eb5e49c3969821fa16b32da245 MesaLib-7.7.zip +53b5b6f78e55de170d43c98cb6aaab7e MesaDemos-7.7.tar.gz +6fd616b27b9826d0faa23e08e05d9435 MesaDemos-7.7.tar.bz2 +240fe06159ad73d5e22c27033b66c80a MesaDemos-7.7.zip +9fe11a904b2a9d8cd06cc52bc330b716 MesaGLUT-7.7.tar.gz +e8dceed05a59a2d3c2619d7d734587e3 MesaGLUT-7.7.tar.bz2 +96af041d435349ee23ead4667ec36363 MesaGLUT-7.7.zip </pre> commit 7e210b93376ab6fef63995c48d7b1766c4335ad8 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Dec 21 18:28:32 2009 -0800 mesa: set version string to 7.7 diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 4f92353..9c758ce 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -32,7 +32,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 7 #define MESA_PATCH 0 -#define MESA_VERSION_STRING "7.7-rc3" +#define MESA_VERSION_STRING "7.7" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) commit 164b5838521bc7ab4af83bb6de8c8711ff40901c Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Dec 21 18:27:50 2009 -0800 intel: Bump driver date to reflect status as final Q4 driver RC diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 2aeca6b..26ff11b 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -68,7 +68,7 @@ int INTEL_DEBUG = (0); #endif -#define DRIVER_DATE "20090712 2009Q2 RC3" +#define DRIVER_DATE "20091221 2009Q4" #define DRIVER_DATE_GEM "GEM " DRIVER_DATE commit 75ad099d3cecc64fe04477ca84bf58b7720edf28 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Dec 21 18:25:30 2009 -0800 mesa: set version string to 7.6.1 diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index e2a98ca..84f0dbc 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -32,7 +32,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 6 #define MESA_PATCH 1 -#define MESA_VERSION_STRING "7.6.1-rc4" +#define MESA_VERSION_STRING "7.6.1" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) commit 982acbddab536ab16b340243d2034abfb30dfe59 Author: Vinson Lee <v...@vmware.com> Date: Sat Oct 10 10:45:16 2009 -0600 progs/perf: Fix MSVC build. (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170) diff --git a/progs/tests/texcomp_image.h b/progs/tests/texcomp_image.h index e63a567..a3884d4 100644 --- a/progs/tests/texcomp_image.h +++ b/progs/tests/texcomp_image.h @@ -1,4 +1,4 @@ -static int ImgSize = 131072; +#define ImgSize 131072 static unsigned char ImgData[131072] = { 0x4d, 0xbc, 0x0b, 0xb4, 0xda, 0x0a, 0x78, 0xa8, 0x8d, 0xbc, 0x0c, 0xac, 0x8b, 0x7f, 0xeb, 0xf7, 0x8d, 0xbc, 0xeb, 0xab, 0xba, 0xb7, 0x82, 0xa2, 0x8d, 0xbc, 0x2b, 0xb4, 0xa2, 0xfd, 0xee, 0x2f, commit 09415ca234d18d4daf257afc0ced52687fdf43a8 Author: José Fonseca <jfons...@vmware.com> Date: Thu Sep 24 12:36:11 2009 +0100 mesa: Fix missing finite symbol error on Windows. Caused by some weird logic regarding the __WIN32__ define which made the finite definition dependent on the header include order. (cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index a296404..4eb249b 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -107,8 +107,7 @@ extern "C" { /** * finite macro. */ -#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP) -# define __WIN32__ +#if defined(_MSC_VER) # define finite _finite #elif defined(__WATCOMC__) # define finite _finite commit de7021b71c1920eeb181d430f2ae2463f964d7cf Author: Michal Krol <mic...@vmware.com> Date: Mon Sep 7 09:31:17 2009 +0200 mesa: Include <unistd.h> only when one is available. (cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f) diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c index fefef57..408ede6 100644 --- a/src/mesa/shader/lex.yy.c +++ b/src/mesa/shader/lex.yy.c @@ -913,6 +913,10 @@ static yyconst flex_int16_t yy_chk[1023] = #define require_rect (yyextra->option.TexRect) #define require_texarray (yyextra->option.TexArray) +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #define return_token_or_IDENTIFIER(condition, token) \ do { \ if (condition) { \ diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l index c2803ff..ce4cb42 100644 --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@ -35,6 +35,10 @@ #define require_rect (yyextra->option.TexRect) #define require_texarray (yyextra->option.TexArray) +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #define return_token_or_IDENTIFIER(condition, token) \ do { \ if (condition) { \ commit 2b7b2b90e3fb52306c10f62e2a56f5199028d862 Author: Vinson Lee <v...@vmware.com> Date: Mon Dec 21 17:25:03 2009 -0800 scons: Define _USE_MATH_DEFINES on MSVC. diff --git a/scons/gallium.py b/scons/gallium.py index bf6172b..9adba0a 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -263,6 +263,7 @@ def generate(env): if msvc and env['toolchain'] != 'winddk': cppdefines += [ 'VC_EXTRALEAN', + '_USE_MATH_DEFINES', '_CRT_SECURE_NO_DEPRECATE', ] if debug: diff --git a/scons/generic.py b/scons/generic.py index a9c2244..2a085dd 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -335,6 +335,7 @@ def generate(env): if msvc: cppdefines += [ 'VC_EXTRALEAN', + '_USE_MATH_DEFINES', '_CRT_SECURE_NO_DEPRECATE', ] if debug: commit bf064ce0c31abb036fc035c59fdc1134705a5e3f Author: Fabio Pedretti <fabio....@libero.it> Date: Tue Dec 22 10:43:35 2009 +1000 configure.ac: fix for libdrm_radeon API changes. diff --git a/configure.ac b/configure.ac index e15e1f6..a15ca11 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AC_CANONICAL_HOST dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.15 +LIBDRM_RADEON_REQUIRED=2.4.17 DRI2PROTO_REQUIRED=1.99.3 dnl Check for progs @@ -577,7 +578,7 @@ dri) GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" - PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) + PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) if test "$HAVE_LIBDRM_RADEON" = yes; then RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS" commit e46ad402f1fecf0fc8d2538eb5abbdde97484799 Author: Fabio Pedretti <fabio....@libero.it> Date: Tue Dec 22 10:43:35 2009 +1000 configure.ac: fix for libdrm_radeon API changes. diff --git a/configure.ac b/configure.ac index 5fe3a94..dfc8e1a 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AC_CANONICAL_HOST dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.3 +LIBDRM_RADEON_REQUIRED=2.4.17 DRI2PROTO_REQUIRED=1.99.3 dnl Check for progs @@ -577,7 +578,7 @@ dri) GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" - PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) + PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) if test "$HAVE_LIBDRM_RADEON" = yes; then RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS" commit bd9e0ebaffeffac09307d5e807b00fef4f551d79 Author: Dave Airlie <airl...@redhat.com> Date: Thu Dec 17 14:29:04 2009 +1000 radeon/r600: use new libdrm_radeon api diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index 776f1e3..8212dc1 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -14,7 +14,7 @@ EGL_SOURCES = server/radeon_egl.c endif ifeq ($(RADEON_LDFLAGS),) -CS_SOURCES = radeon_cs_space_drm.c +CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c endif RADEON_COMMON_SOURCES = \ diff --git a/src/mesa/drivers/dri/r200/radeon_bo.c b/src/mesa/drivers/dri/r200/radeon_bo.c new file mode 120000 index 0000000..9448ffe --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_bo.c @@ -0,0 +1 @@ +../radeon/radeon_bo.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/r200/radeon_bo_int_drm.h b/src/mesa/drivers/dri/r200/radeon_bo_int_drm.h new file mode 120000 index 0000000..0294509 --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_bo_int_drm.h @@ -0,0 +1 @@ +../radeon/radeon_bo_int_drm.h \ No newline at end of file diff --git a/src/mesa/drivers/dri/r200/radeon_cs.c b/src/mesa/drivers/dri/r200/radeon_cs.c new file mode 120000 index 0000000..66b7ad1 --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_cs.c @@ -0,0 +1 @@ +../radeon/radeon_cs.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/r200/radeon_cs_int_drm.h b/src/mesa/drivers/dri/r200/radeon_cs_int_drm.h new file mode 120000 index 0000000..462f524 --- /dev/null +++ b/src/mesa/drivers/dri/r200/radeon_cs_int_drm.h @@ -0,0 +1 @@ +../radeon/radeon_cs_int_drm.h \ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile index cb0f715..f87a6dd 100644 --- a/src/mesa/drivers/dri/r300/Makefile +++ b/src/mesa/drivers/dri/r300/Makefile @@ -14,7 +14,7 @@ EGL_SOURCES = server/radeon_egl.c endif ifeq ($(RADEON_LDFLAGS),) -CS_SOURCES = radeon_cs_space_drm.c +CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c endif COMMON_SOURCES = \ diff --git a/src/mesa/drivers/dri/r300/radeon_bo.c b/src/mesa/drivers/dri/r300/radeon_bo.c new file mode 120000 index 0000000..9448ffe --- /dev/null +++ b/src/mesa/drivers/dri/r300/radeon_bo.c @@ -0,0 +1 @@ +../radeon/radeon_bo.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_bo_int_drm.h b/src/mesa/drivers/dri/r300/radeon_bo_int_drm.h new file mode 120000 index 0000000..0294509 --- /dev/null +++ b/src/mesa/drivers/dri/r300/radeon_bo_int_drm.h @@ -0,0 +1 @@ +../radeon/radeon_bo_int_drm.h \ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_cs.c b/src/mesa/drivers/dri/r300/radeon_cs.c new file mode 120000 index 0000000..66b7ad1 --- /dev/null +++ b/src/mesa/drivers/dri/r300/radeon_cs.c @@ -0,0 +1 @@ +../radeon/radeon_cs.c \ No newline at end of file diff --git a/src/mesa/drivers/dri/r300/radeon_cs_int_drm.h b/src/mesa/drivers/dri/r300/radeon_cs_int_drm.h new file mode 120000 index 0000000..462f524 --- /dev/null +++ b/src/mesa/drivers/dri/r300/radeon_cs_int_drm.h @@ -0,0 +1 @@ +../radeon/radeon_cs_int_drm.h \ No newline at end of file diff --git a/src/mesa/drivers/dri/r600/Makefile b/src/mesa/drivers/dri/r600/Makefile index 9b7c420..26f47b7 100644 --- a/src/mesa/drivers/dri/r600/Makefile +++ b/src/mesa/drivers/dri/r600/Makefile @@ -14,7 +14,7 @@ EGL_SOURCES = server/radeon_egl.c endif ifeq ($(RADEON_LDFLAGS),) -CS_SOURCES = radeon_cs_space_drm.c +CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c endif COMMON_SOURCES = \ diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c index 5e15048..370bb04 100644 --- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c +++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c @@ -52,6 +52,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_mipmap_tree.h" #include "radeon_reg.h" +#ifdef HAVE_LIBDRM_RADEON +#include "radeon_cs_int.h" +#else +#include "radeon_cs_int_drm.h" +#endif + struct r600_cs_manager_legacy { struct radeon_cs_manager base; @@ -68,28 +74,27 @@ struct r600_cs_reloc_legacy { uint32_t *reloc_indices; }; - -static struct radeon_cs * r600_cs_create(struct radeon_cs_manager *csm, - uint32_t ndw) +static struct radeon_cs_int *r600_cs_create(struct radeon_cs_manager *csm, + uint32_t ndw) { - struct radeon_cs *cs; + struct radeon_cs_int *csi; - cs = (struct radeon_cs*)calloc(1, sizeof(struct radeon_cs)); - if (cs == NULL) { + csi = (struct radeon_cs_int*)calloc(1, sizeof(struct radeon_cs_int)); + if (csi == NULL) { return NULL; } - cs->csm = csm; - cs->ndw = (ndw + 0x3FF) & (~0x3FF); - cs->packets = (uint32_t*)malloc(4*cs->ndw); -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org