[Mesa-dev] [PATCH] main: remove duplicated includes
Remove duplicated includes of guarded headers. Signed-off-by: Nicolas Kaiser --- src/mesa/main/pack.c |1 - src/mesa/main/texstore.c |1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 4bb0a90..ad8ab9d 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -37,7 +37,6 @@ #include "mtypes.h" #include "pack.h" #include "pixeltransfer.h" -#include "imports.h" /** diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index cf12241..c4fe82a 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -63,7 +63,6 @@ #include "pack.h" #include "pbo.h" #include "imports.h" -#include "pack.h" #include "texcompress.h" #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" -- 1.7.3.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] cell: unbalanced parenthesis
Signed-off-by: Nicolas Kaiser --- src/gallium/drivers/cell/spu/spu_vertex_shader.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/cell/spu/spu_vertex_shader.c b/src/gallium/drivers/cell/spu/spu_vertex_shader.c index 3e9804b..d6febd3 100644 --- a/src/gallium/drivers/cell/spu/spu_vertex_shader.c +++ b/src/gallium/drivers/cell/spu/spu_vertex_shader.c @@ -188,7 +188,7 @@ run_vertex_program(struct spu_vs_context *draw, PIPE_ALIGN_VAR(16) unsigned char -immediates[(sizeof(float) * 4 * TGSI_EXEC_NUM_IMMEDIATES) + 32]); +immediates[(sizeof(float) * 4 * TGSI_EXEC_NUM_IMMEDIATES) + 32]; void -- 1.7.5.rc3 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 10/10] intel: Request DRI2 buffers for separate stencil and hiz
Just noticed two typos in comments. * Chad Versace : > --- a/src/mesa/drivers/dri/intel/intel_context.c > +++ b/src/mesa/drivers/dri/intel/intel_context.c (..) > +/** > + * \brief Verify that the X driver supports hiz and separate stencil. > + * > + * This implements the cleanup stage of the handshake described in the > + * comments for 'enum intel_dri2_has_hiz'. > + * > + * This should be called from intel_update_renderbuffers() after 1) the > + * DRIdrawable has been queried for its buffers via > DRI2GetBuffersWithFormat() > + * and 2) the DRM region of each returned DRIbuffer has been assigned to the > + * appropriate intel_renderbuffer. Futhermore, this should be called *only* Furthermore (..) > + /* > + * I don't know how to recover from the failure assertion below. > + * Rather than fail gradually and unexpectedtly, we should just die unexpectedly Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] mga: enable GL_ARB_vertex_array_object extension
Tested on a Matrox G550 AGP. I noticed that the two piglit VAO tests as well as the vao_demo only test APPLE_vertex_array_object, which is already enabled on mga. However, the bufferobj test appears to use the extension: before: $ tests/bufferobj GL_RENDERER = Mesa DRI G400 AGP 1x Using GL_ARB_vertex_array_object: no $ glewinfo |grep _vertex_array_object GL_APPLE_vertex_array_object: OK GL_ARB_vertex_array_object:OK [MISSING] GL_ATI_vertex_array_object:MISSING after: $ tests/bufferobj GL_RENDERER = Mesa DRI G400 AGP 1x Using GL_ARB_vertex_array_object: yes $ glewinfo |grep _vertex_array_object GL_APPLE_vertex_array_object: OK GL_ARB_vertex_array_object:OK GL_ATI_vertex_array_object:MISSING Signed-off-by: Nicolas Kaiser --- src/mesa/drivers/dri/mga/mga_xmesa.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index eb7df97..6ec99db 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -66,6 +66,7 @@ #include "GL/internal/dri_interface.h" +#define need_GL_ARB_vertex_array_object #define need_GL_ARB_vertex_program #define need_GL_EXT_fog_coord #define need_GL_EXT_gpu_program_parameters @@ -382,6 +383,7 @@ static const struct dri_extension g400_extensions[] = static const struct dri_extension card_extensions[] = { { "GL_ARB_texture_rectangle", NULL }, + { "GL_ARB_vertex_array_object",GL_ARB_vertex_array_object_functions }, { "GL_EXT_blend_logic_op", NULL }, { "GL_EXT_fog_coord", GL_EXT_fog_coord_functions }, /* paletted_textures currently doesn't work, but we could fix them later */ -- 1.7.5.3 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] r600g winsys backend rework
* Marek Olšák : > I have been recently trying to get thread offloading of the CS ioctl > into r600g in order to reduce the impact of kernel overhead on fps. > That, unfortunately, requires whole winsys/radeon to be used, because > even the buffer management (bo_map, bo_wait, bo_busy) must take into > account that a CS ioctl may be in progress. Besides that, there are > several possible race conditions in r600g, so instead of rewriting > r600g and trying to do what winsys/radeon is doing, I decided to > simply use winsys/radeon. FWIW, looks good at my place (RS780). Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r600g: Cleaned up index buffer reference handling in the draw module.
* Tilman Sauerbeck : > This fixes a buffer leak. Thanks! Is this one supposed to go in like the other one? I can confirm that it appears to fix a leak at my place as well. Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 0/24] remove duplicated includes
These patches remove duplicated includes of guarded headers. Nicolas Kaiser (24): swrast: remove duplicated include egl: remove duplicated include gallium/rtasm: remove duplicated include gallium/util: remove duplicated include gallium/i915: remove duplicated include gallium/llvmpipe: remove duplicated include gallium/softpipe: remove duplicated include gallium/st: remove duplicated includes gallium/winsys: remove duplicated include glx: remove duplicated include dri/common: remove duplicated include dri/i810: remove duplicated include dri/i915: remove duplicated include dri/i965: remove duplicated include dri/intel: remove duplicated include dri/mga: remove duplicated include dri/r128: remove duplicated include dri/r300: remove duplicated include dri/r600: remove duplicated include dri/radeon: remove duplicated includes dri/savage: remove duplicated include main: remove duplicated includes math: remove duplicated includes st: remove duplicated include Signed-off-by: Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 01/24] swrast: remove duplicated include
Remove duplicated include. --- src/mesa/swrast/s_aatriangle.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c index 1d90f32..1753167 100644 --- a/src/mesa/swrast/s_aatriangle.c +++ b/src/mesa/swrast/s_aatriangle.c @@ -31,7 +31,6 @@ #include "main/glheader.h" #include "main/context.h" #include "main/colormac.h" -#include "main/context.h" #include "main/macros.h" #include "main/imports.h" #include "s_aatriangle.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 02/24] egl: remove duplicated include
Remove duplicated include. --- src/egl/main/egldriver.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 67f1d3d..a4ff691 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -18,7 +18,6 @@ #include "eglmisc.h" #include "eglmode.h" #include "eglscreen.h" -#include "eglstring.h" #include "eglsurface.h" #include "eglimage.h" #include "eglsync.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 03/24] gallium/rtasm: remove duplicated include
Remove duplicated include. --- src/gallium/auxiliary/rtasm/rtasm_execmem.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index 65d5ce7..fbde1d1 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -58,7 +58,6 @@ #include #include -#include "os/os_thread.h" #include "util/u_mm.h" #define EXEC_HEAP_SIZE (10*1024*1024) -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 04/24] gallium/util: remove duplicated include
Remove duplicated include. --- src/gallium/auxiliary/util/u_sse.h |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/util/u_sse.h b/src/gallium/auxiliary/util/u_sse.h index 87959ab..03198c9 100644 --- a/src/gallium/auxiliary/util/u_sse.h +++ b/src/gallium/auxiliary/util/u_sse.h @@ -78,8 +78,6 @@ _mm_castps_si128(__m128 a) #else /* !PIPE_ARCH_SSSE3 */ -#include - /** * Describe _mm_shuffle_epi8() with gcc extended inline assembly, for cases * where -mssse3 is not supported/enabled. -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 05/24] gallium/i915: remove duplicated include
Remove duplicated include. --- src/gallium/drivers/i915/i915_state_emit.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c index 7bb7893..bd059d5 100644 --- a/src/gallium/drivers/i915/i915_state_emit.c +++ b/src/gallium/drivers/i915/i915_state_emit.c @@ -30,7 +30,6 @@ #include "i915_context.h" #include "i915_batch.h" #include "i915_debug.h" -#include "i915_reg.h" #include "i915_resource.h" #include "pipe/p_context.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 06/24] gallium/llvmpipe: remove duplicated include
Remove duplicated include. --- src/gallium/drivers/llvmpipe/lp_setup_point.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_setup_point.c b/src/gallium/drivers/llvmpipe/lp_setup_point.c index a95c157..3b217f9 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_point.c +++ b/src/gallium/drivers/llvmpipe/lp_setup_point.c @@ -33,7 +33,6 @@ #include "util/u_math.h" #include "util/u_memory.h" #include "lp_perf.h" -#include "lp_setup_context.h" #include "lp_rast.h" #include "lp_state_fs.h" #include "tgsi/tgsi_scan.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 07/24] gallium/softpipe: remove duplicated include
Remove duplicated include. --- src/gallium/drivers/softpipe/sp_state_sampler.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index aedb5bb..b59fbc3 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -33,7 +33,6 @@ #include "util/u_inlines.h" #include "draw/draw_context.h" -#include "draw/draw_context.h" #include "sp_context.h" #include "sp_state.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 08/24] gallium/st: remove duplicated includes
Remove duplicated includes. --- src/gallium/state_trackers/python/st_device.c |1 - src/gallium/state_trackers/vega/api_images.c |1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c index dce24bc..2981345 100644 --- a/src/gallium/state_trackers/python/st_device.c +++ b/src/gallium/state_trackers/python/st_device.c @@ -31,7 +31,6 @@ #include "pipe/p_shader_tokens.h" #include "util/u_inlines.h" #include "cso_cache/cso_context.h" -#include "util/u_inlines.h" #include "util/u_math.h" #include "util/u_memory.h" #include "util/u_sampler.h" diff --git a/src/gallium/state_trackers/vega/api_images.c b/src/gallium/state_trackers/vega/api_images.c index 547508f..c36b3d2 100644 --- a/src/gallium/state_trackers/vega/api_images.c +++ b/src/gallium/state_trackers/vega/api_images.c @@ -31,7 +31,6 @@ #include "vg_context.h" #include "vg_translate.h" #include "api_consts.h" -#include "image.h" #include "api.h" #include "pipe/p_context.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 10/24] glx: remove duplicated include
Remove duplicated include. --- src/glx/glxclient.h |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 324b5a6..36a0808 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -89,8 +89,6 @@ typedef struct __GLXDRIdisplayRec __GLXDRIdisplay; typedef struct __GLXDRIscreenRec __GLXDRIscreen; typedef struct __GLXDRIdrawableRec __GLXDRIdrawable; -#include "glxextensions.h" - struct __GLXDRIdisplayRec { /** -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 11/24] dri/common: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/common/vblank.h |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/common/vblank.h b/src/mesa/drivers/dri/common/vblank.h index 29d1ad8..067fb5e 100644 --- a/src/mesa/drivers/dri/common/vblank.h +++ b/src/mesa/drivers/dri/common/vblank.h @@ -61,10 +61,6 @@ extern int driWaitForVBlank( __DRIdrawable *priv, #include /* for usleep() */ #include/* for sched_yield() */ -#ifdef linux -#include/* for sched_yield() */ -#endif - #define DO_USLEEP(nr) \ do { \ if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr ); \ -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 12/24] dri/i810: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/i810/i810tex.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c index 2ccb956..5c5c80d 100644 --- a/src/mesa/drivers/dri/i810/i810tex.c +++ b/src/mesa/drivers/dri/i810/i810tex.c @@ -31,7 +31,6 @@ #include "main/teximage.h" #include "main/texobj.h" #include "main/colormac.h" -#include "main/texobj.h" #include "main/mm.h" #include "texmem.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 13/24] dri/i915: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/i915/i915_context.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index bf6762d..412714a 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -40,7 +40,6 @@ #include "i915_reg.h" #include "i915_program.h" -#include "intel_tris.h" #include "intel_span.h" /*** -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 14/24] dri/i965: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/i965/brw_vtbl.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 8f1601d..3d7a98c 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -43,7 +43,6 @@ #include "brw_defines.h" #include "brw_state.h" #include "brw_draw.h" -#include "brw_state.h" #include "brw_vs.h" #include "brw_wm.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 09/24] gallium/winsys: remove duplicated include
Remove duplicated include. --- src/gallium/winsys/svga/drm/vmw_screen_dri.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c index 7bd4407..258084a 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c @@ -30,7 +30,6 @@ #include "util/u_format.h" #include "vmw_screen.h" -#include "vmw_screen.h" #include "vmw_surface.h" #include "svga_drm_public.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 15/24] dri/intel: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/intel/intel_tex_image.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 03aba58..187e537 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -10,7 +10,6 @@ #include "main/texstore.h" #include "main/texgetimage.h" #include "main/texobj.h" -#include "main/texstore.h" #include "main/teximage.h" #include "intel_context.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 16/24] dri/mga: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/mga/mga_xmesa.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 069947e..13f73a8 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -57,7 +57,6 @@ #include "mgatris.h" #include "mgavb.h" #include "mgapixel.h" -#include "mga_xmesa.h" #include "mga_dri.h" #include "utils.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 17/24] dri/r128: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/r128/r128_tex.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c index b5a19b5..2dd47b0 100644 --- a/src/mesa/drivers/dri/r128/r128_tex.c +++ b/src/mesa/drivers/dri/r128/r128_tex.c @@ -43,7 +43,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/teximage.h" #include "main/texobj.h" #include "main/imports.h" -#include "main/texobj.h" #include "main/macros.h" #include "xmlpool.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 18/24] dri/r300: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/r300/radeon_context.h |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/r300/radeon_context.h b/src/mesa/drivers/dri/r300/radeon_context.h index da4812d..e793656 100644 --- a/src/mesa/drivers/dri/r300/radeon_context.h +++ b/src/mesa/drivers/dri/r300/radeon_context.h @@ -49,8 +49,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "drm.h" #include "dri_util.h" -#include "radeon_screen.h" - #define FALLBACK( radeon, bit, mode ) fprintf(stderr, "%s:%s\n", __LINE__, __FILE__); /* TCL fallbacks */ -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 19/24] dri/r600: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/r600/r600_cmdbuf.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c index b3331fc..ce2f777 100644 --- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c +++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c @@ -47,7 +47,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_reg.h" #include "r600_cmdbuf.h" #include "radeon_bocs_wrapper.h" -#include "radeon_reg.h" #ifdef HAVE_LIBDRM_RADEON #include "radeon_cs_int.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 20/24] dri/radeon: remove duplicated includes
Remove duplicated includes. --- src/mesa/drivers/dri/radeon/radeon_ioctl.c |1 - src/mesa/drivers/dri/radeon/radeon_maos_verts.c |1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c index 5ac526c..d08a82f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c @@ -44,7 +44,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/imports.h" #include "main/simple_list.h" -#include "swrast/swrast.h" #include "radeon_context.h" #include "radeon_common.h" diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c index 98f96ff..ad3bc2d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c @@ -40,7 +40,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "math/m_translate.h" #include "tnl/tnl.h" #include "tnl/t_pipeline.h" -#include "math/m_translate.h" #include "radeon_context.h" #include "radeon_state.h" #include "radeon_ioctl.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 21/24] dri/savage: remove duplicated include
Remove duplicated include. --- src/mesa/drivers/dri/savage/savage_xmesa.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c index cbdc9c8..bbf2fd3 100644 --- a/src/mesa/drivers/dri/savage/savage_xmesa.c +++ b/src/mesa/drivers/dri/savage/savage_xmesa.c @@ -26,7 +26,6 @@ #include #include "main/context.h" -#include "main/context.h" #include "main/matrix.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 22/24] main: remove duplicated includes
Remove duplicated includes. --- src/mesa/main/api_exec.c |5 + src/mesa/main/dlist.c|1 - src/mesa/main/renderbuffer.c |1 - 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index b87aa47..ae653e1 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -91,10 +91,7 @@ #include "mtypes.h" #include "varray.h" #include "viewport.h" -#if FEATURE_NV_vertex_program -#include "nvprogram.h" -#endif -#if FEATURE_NV_fragment_program +#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program #include "nvprogram.h" #endif #if FEATURE_ARB_shader_objects diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 3a730f0..cccec24 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -52,7 +52,6 @@ #include "hash.h" #include "image.h" #include "light.h" -#include "dlist.h" #include "macros.h" #include "queryobj.h" #include "teximage.h" diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c index adc1199..118fb52 100644 --- a/src/mesa/main/renderbuffer.c +++ b/src/mesa/main/renderbuffer.c @@ -46,7 +46,6 @@ #include "fbobject.h" #include "formats.h" #include "mtypes.h" -#include "fbobject.h" #include "renderbuffer.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 23/24] math: remove duplicated includes
Remove duplicated includes. --- src/mesa/math/m_matrix.c |1 - src/mesa/math/m_vector.c |1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index 048b231..02aedba 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -37,7 +37,6 @@ #include "main/glheader.h" #include "main/imports.h" #include "main/macros.h" -#include "main/imports.h" #include "m_matrix.h" diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c index fbd63fd..4bded31 100644 --- a/src/mesa/math/m_vector.c +++ b/src/mesa/math/m_vector.c @@ -30,7 +30,6 @@ #include "main/glheader.h" #include "main/imports.h" #include "main/macros.h" -#include "main/imports.h" #include "m_vector.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 24/24] st: remove duplicated include
Remove duplicated include. --- src/mesa/state_tracker/st_cb_rasterpos.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 7b2eb80..e5f7b6f 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -44,7 +44,6 @@ #include "st_atom.h" #include "st_draw.h" #include "st_cb_rasterpos.h" -#include "st_draw.h" #include "draw/draw_context.h" #include "draw/draw_pipe.h" #include "vbo/vbo.h" -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] dri/r600: Fix insufficient return type
Two functions with unsigned return type, but returning negative constants to indicate an error condition. Inspired by similar Linux kernel patches by Julia Lawall (http://coccinelle.lip6.fr/). Signed-off-by: Nicolas Kaiser --- src/mesa/drivers/dri/r600/evergreen_render.c |2 +- src/mesa/drivers/dri/r600/r700_render.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/r600/evergreen_render.c b/src/mesa/drivers/dri/r600/evergreen_render.c index 85b2f9d..70c8270 100644 --- a/src/mesa/drivers/dri/r600/evergreen_render.c +++ b/src/mesa/drivers/dri/r600/evergreen_render.c @@ -55,7 +55,7 @@ #include "radeon_buffer_objects.h" #include "radeon_common_context.h" -static unsigned int evergreenPrimitiveType(int prim) //same +static int evergreenPrimitiveType(int prim) //same { switch (prim & PRIM_MODE_MASK) { diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c index f90c69c..f857536 100644 --- a/src/mesa/drivers/dri/r600/r700_render.c +++ b/src/mesa/drivers/dri/r600/r700_render.c @@ -58,7 +58,7 @@ void r700WaitForIdle(context_t *context); void r700WaitForIdleClean(context_t *context); -static unsigned int r700PrimitiveType(int prim); +static int r700PrimitiveType(int prim); GLboolean r700SyncSurf(context_t *context, struct radeon_bo *pbo, uint32_t read_domain, @@ -151,7 +151,7 @@ GLboolean r700SyncSurf(context_t *context, return GL_TRUE; } -static unsigned int r700PrimitiveType(int prim) +static int r700PrimitiveType(int prim) { switch (prim & PRIM_MODE_MASK) { -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] i965g: use Elements macro instead of manual sizeofs
Signed-off-by: Nicolas Kaiser --- src/gallium/drivers/i965/intel_decode.c | 20 +++- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gallium/drivers/i965/intel_decode.c b/src/gallium/drivers/i965/intel_decode.c index bd8b917..36c04a3 100644 --- a/src/gallium/drivers/i965/intel_decode.c +++ b/src/gallium/drivers/i965/intel_decode.c @@ -40,6 +40,7 @@ #include #include +#include "util/u_memory.h" #include "util/u_string.h" #include "intel_decode.h" @@ -116,8 +117,7 @@ decode_mi(const uint32_t *data, int count, uint32_t hw_offset, int *failures) }; -for (opcode = 0; opcode < sizeof(opcodes_mi) / sizeof(opcodes_mi[0]); -opcode++) { +for (opcode = 0; opcode < Elements(opcodes_mi); opcode++) { if ((data[0] & 0x1f80) >> 23 == opcodes_mi[opcode].opcode) { unsigned int len = 1, i; @@ -275,8 +275,7 @@ decode_2d(const uint32_t *data, int count, uint32_t hw_offset, int *failures) return len; } -for (opcode = 0; opcode < sizeof(opcodes_2d) / sizeof(opcodes_2d[0]); -opcode++) { +for (opcode = 0; opcode < Elements(opcodes_2d); opcode++) { if ((data[0] & 0x1fc0) >> 22 == opcodes_2d[opcode].opcode) { unsigned int i; @@ -1037,9 +1036,7 @@ decode_3d_1d(const uint32_t *data, int count, uint32_t hw_offset, int *failures, return len; } -for (opcode = 0; opcode < sizeof(opcodes_3d_1d) / sizeof(opcodes_3d_1d[0]); -opcode++) -{ +for (opcode = 0; opcode < Elements(opcodes_3d_1d); opcode++) { if (opcodes_3d_1d[opcode].i830_only && !i830) continue; @@ -1291,8 +1288,7 @@ decode_3d(const uint32_t *data, int count, uint32_t hw_offset, int *failures) return decode_3d_1c(data, count, hw_offset, failures); } -for (opcode = 0; opcode < sizeof(opcodes_3d) / sizeof(opcodes_3d[0]); -opcode++) { +for (opcode = 0; opcode < Elements(opcodes_3d); opcode++) { if ((data[0] & 0x1f00) >> 24 == opcodes_3d[opcode].opcode) { unsigned int len = 1, i; @@ -1637,8 +1633,7 @@ decode_3d_965(const uint32_t *data, int count, uint32_t hw_offset, int *failures return len; } -for (opcode = 0; opcode < sizeof(opcodes_3d) / sizeof(opcodes_3d[0]); -opcode++) { +for (opcode = 0; opcode < Elements(opcodes_3d); opcode++) { if ((data[0] & 0x) >> 16 == opcodes_3d[opcode].opcode) { unsigned int i; len = 1; @@ -1705,8 +1700,7 @@ decode_3d_i830(const uint32_t *data, int count, uint32_t hw_offset, int *failure return decode_3d_1c(data, count, hw_offset, failures); } -for (opcode = 0; opcode < sizeof(opcodes_3d) / sizeof(opcodes_3d[0]); -opcode++) { +for (opcode = 0; opcode < Elements(opcodes_3d); opcode++) { if ((data[0] & 0x1f00) >> 24 == opcodes_3d[opcode].opcode) { unsigned int len = 1, i; -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] gallium/nv50: always true conditional
Untested: Am I guessing right it was rather meant this way? --- src/gallium/drivers/nv50/nv50_pc_optimize.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_pc_optimize.c b/src/gallium/drivers/nv50/nv50_pc_optimize.c index 921ed15..27eb381 100644 --- a/src/gallium/drivers/nv50/nv50_pc_optimize.c +++ b/src/gallium/drivers/nv50/nv50_pc_optimize.c @@ -452,7 +452,7 @@ nv_pass_lower_mods(struct nv_pass *ctx, struct nv_basic_block *b) if (nvi->opcode == NV_OP_SAT) { mi = nvi->src[0]->value->insn; - if (mi->opcode != NV_OP_ADD || mi->opcode != NV_OP_MAD) + if (mi->opcode != NV_OP_ADD && mi->opcode != NV_OP_MAD) continue; if (mi->flags_def || mi->def[0]->refc > 1) continue; -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] nv50: fix typo in copyright notice
Fix typo in copyright notice. Signed-off-by: Nicolas Kaiser --- src/gallium/drivers/nv50/nv50_program.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c index db68176..9f5e58e 100644 --- a/src/gallium/drivers/nv50/nv50_program.c +++ b/src/gallium/drivers/nv50/nv50_program.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Chrsitoph Bumiller + * Copyright 2010 Christoph Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] gl.h, gl2.h, gallium: use stdbool.h for GLboolean and boolean
This patch adds support for the compiler built-in Boolean type to GLboolean and the "boolean" type in gallium by bringing them in line with the "bool" type in stdbool.h. Signed-off-by: Nicolas Kaiser --- include/GL/gl.h |7 --- include/GLES/gl.h |7 --- include/GLES2/gl2.h |7 --- src/gallium/include/pipe/p_compiler.h |2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/GL/gl.h b/include/GL/gl.h index 8e5f138..2d66053 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -149,11 +149,12 @@ extern "C" { #define GL_ARB_imaging 1 +#include /* * Datatypes */ typedef unsigned int GLenum; -typedef unsigned char GLboolean; +typedef bool GLboolean; typedef unsigned int GLbitfield; typedef void GLvoid; typedef signed charGLbyte; /* 1-byte signed */ @@ -175,8 +176,8 @@ typedef double GLclampd; /* double precision float in [0,1] */ */ /* Boolean values */ -#define GL_FALSE 0x0 -#define GL_TRUE0x1 +#define GL_FALSE false +#define GL_TRUEtrue /* Data types */ #define GL_BYTE0x1400 diff --git a/include/GLES/gl.h b/include/GLES/gl.h index 5b8d85a..100b0c2 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -4,6 +4,7 @@ /* $Revision: 10601 $ on $Date:: 2010-03-04 22:15:27 -0800 #$ */ #include +#include #ifdef __cplusplus extern "C" { @@ -17,7 +18,7 @@ extern "C" { typedef void GLvoid; typedef char GLchar; typedef unsigned int GLenum; -typedef unsigned charGLboolean; +typedef bool GLboolean; typedef unsigned int GLbitfield; typedef khronos_int8_t GLbyte; typedef shortGLshort; @@ -49,8 +50,8 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_COLOR_BUFFER_BIT 0x4000 /* Boolean */ -#define GL_FALSE 0 -#define GL_TRUE 1 +#define GL_FALSE false +#define GL_TRUE true /* BeginMode */ #define GL_POINTS 0x diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index e1d3b87..811a9f1 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -4,6 +4,7 @@ /* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ #include +#include #ifdef __cplusplus extern "C" { @@ -21,7 +22,7 @@ extern "C" { typedef void GLvoid; typedef char GLchar; typedef unsigned int GLenum; -typedef unsigned charGLboolean; +typedef bool GLboolean; typedef unsigned int GLbitfield; typedef khronos_int8_t GLbyte; typedef shortGLshort; @@ -47,8 +48,8 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_COLOR_BUFFER_BIT 0x4000 /* Boolean */ -#define GL_FALSE 0 -#define GL_TRUE 1 +#define GL_FALSE false +#define GL_TRUE true /* BeginMode */ #define GL_POINTS 0x diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 3d6b5b5..b12399b 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -72,7 +72,7 @@ typedef unsigned short ushort; #endif typedef unsigned char ubyte; -typedef unsigned char boolean; +typedef bool boolean; #ifndef TRUE #define TRUE true #endif -- 1.7.2.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] fix typos in MESA specs
Signed-off-by: Nicolas Kaiser --- docs/MESA_agp_offset.spec |2 +- docs/MESA_drm_image.spec |4 ++-- docs/MESA_multithread_makecurrent.spec |2 +- docs/MESA_pack_invert.spec |2 +- docs/MESA_release_buffers.spec |8 docs/MESA_resize_buffers.spec |4 ++-- docs/MESA_swap_control.spec|4 ++-- docs/MESA_texture_array.spec |8 docs/MESA_texture_signed_rgba.spec |4 ++-- docs/MESA_window_pos.spec |4 ++-- docs/MESA_ycbcr_texture.spec |4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/MESA_agp_offset.spec b/docs/MESA_agp_offset.spec index 8dcc723..06e1d90 100644 --- a/docs/MESA_agp_offset.spec +++ b/docs/MESA_agp_offset.spec @@ -67,7 +67,7 @@ Additions to Chapter 3 the GLX 1.4 Specification (Functions and Errors) On "PC" computers, AGP memory can be allocated with glXAllocateMemoryNV and freed with glXFreeMemoryNV. Sometimes it's useful to know where a block of AGP memory is located with respect to the start of the AGP -aperature. The function +aperture. The function GLuint glXGetAGPOffsetMESA( const GLvoid *pointer ) diff --git a/docs/MESA_drm_image.spec b/docs/MESA_drm_image.spec index c9853a7..198de3e 100644 --- a/docs/MESA_drm_image.spec +++ b/docs/MESA_drm_image.spec @@ -24,7 +24,7 @@ Number Dependencies -Reguires EGL 1.4 or later. This extension is written against the +Requires EGL 1.4 or later. This extension is written against the wording of the EGL 1.4 specification. EGL_KHR_base_image is required. @@ -134,7 +134,7 @@ Issues RESOLVED: The eglQueryImage function has been proposed often, but it goes against the EGLImage design. EGLImages are opaque handles to a 2D array of pixels, which can be passed between -client APIs. By referenceing an EGLImage in a client API, the +client APIs. By referencing an EGLImage in a client API, the EGLImage target (a texture, a renderbuffer or such) can be used to query the attributes of the EGLImage. We don't have a full client API for creating and querying DRM buffers, though, diff --git a/docs/MESA_multithread_makecurrent.spec b/docs/MESA_multithread_makecurrent.spec index 5065c2f..7a58731 100644 --- a/docs/MESA_multithread_makecurrent.spec +++ b/docs/MESA_multithread_makecurrent.spec @@ -70,7 +70,7 @@ Changes to Chapter 2 of the GLX 1.3 Specification (Functions and Errors) In addition, an indirect rendering context can be current for only one thread at a time. A direct rendering context may be current to multiple threads, with synchronization of access to - the context thruogh the GL managed by the application through + the context through the GL managed by the application through mutexes. Changes to Chapter 3 of the GLX 1.3 Specification (Functions and Errors) diff --git a/docs/MESA_pack_invert.spec b/docs/MESA_pack_invert.spec index 53d5fca..33fb3c7 100644 --- a/docs/MESA_pack_invert.spec +++ b/docs/MESA_pack_invert.spec @@ -48,7 +48,7 @@ IP Status Issues -1. Should we also defined UNPACK_INVERT_MESA for glDrawPixels, etc? +1. Should we also define UNPACK_INVERT_MESA for glDrawPixels, etc? Resolved: No, we're only concerned with pixel packing. There are other solutions for inverting images when using glDrawPixels (negative Y pixel diff --git a/docs/MESA_release_buffers.spec b/docs/MESA_release_buffers.spec index 8db9350..52d1e5a 100644 --- a/docs/MESA_release_buffers.spec +++ b/docs/MESA_release_buffers.spec @@ -31,12 +31,12 @@ Overview Mesa's implementation of GLX is entirely implemented on the client side. Therefore, Mesa cannot immediately detect when an X window or pixmap is -destroyed in order to free any ancilliary data associated with the window +destroyed in order to free any ancillary data associated with the window or pixmap. The glxMesaReleaseBuffers() function can be used to explicitly indicate -when the back color buffer, depth buffer, stencil buffer, and/or accum- -ulation buffer associated with a drawable can be freed. +when the back color buffer, depth buffer, stencil buffer, and/or accumu- +lation buffer associated with a drawable can be freed. IP Status @@ -60,7 +60,7 @@ Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors) Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d ); -causes all software ancilliary buffers (back buffer, depth, stencil, +causes all software ancillary buffers (back buffer, depth, stencil, accum, etc) associated with the named drawable to be immediately deallocated. True is returned if is a valid Mesa GLX drawable, else False is returned. After calling glXReleaseBuff
[Mesa-dev] [PATCH] fix typos in wayland spec
Signed-off-by: Nicolas Kaiser --- docs/WL_bind_wayland_display.spec |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/WL_bind_wayland_display.spec b/docs/WL_bind_wayland_display.spec index 0ff49d6..b4e6703 100644 --- a/docs/WL_bind_wayland_display.spec +++ b/docs/WL_bind_wayland_display.spec @@ -25,7 +25,7 @@ Number Dependencies -Reguires EGL 1.4 or later. This extension is written against the +Requires EGL 1.4 or later. This extension is written against the wording of the EGL 1.4 specification. EGL_KHR_base_image is required. @@ -40,9 +40,9 @@ Overview provides a new target for eglCreateImageKHR, to create an EGLImage from a wl_buffer -Adding a implementation specific wayland interface, allows the +Adding an implementation specific wayland interface, allows the EGL implementation to define specific wayland requests and events, -needed for buffer sharing in a EGL wayland platform. +needed for buffer sharing in an EGL wayland platform. IP Status -- 1.7.3.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
Signed-off-by: Nicolas Kaiser --- According to Marek Olšák, this extension is quite popular in the GL community.[1] Tests look good: ./src/tests/prog_parameter GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 GL_VERSION = 1.3 Mesa 7.11-devel (git-4ee40c3) GL_EXT_gpu_program_parameters available, testing that path. Testing glProgramEnvParameter4fvARB (count = 256)... Testing glProgramEnvParameters4fvEXT (count = 256)... Testing glProgramLocalParameter4fvARB (count = 1024)... Testing glProgramLocalParameters4fvEXT (count = 1024)... PASS! Best regards, Nicolas Kaiser [1] http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg12980.html src/mesa/drivers/dri/r200/r200_context.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 4773263..d19370e 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -69,6 +69,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define need_GL_EXT_secondary_color #define need_GL_EXT_blend_equation_separate #define need_GL_EXT_blend_func_separate +#define need_GL_EXT_gpu_program_parameters #define need_GL_NV_vertex_program #define need_GL_ARB_point_parameters #define need_GL_EXT_framebuffer_object @@ -123,6 +124,7 @@ static const struct dri_extension card_extensions[] = { "GL_EXT_blend_minmax", GL_EXT_blend_minmax_functions }, { "GL_EXT_blend_subtract", NULL }, { "GL_EXT_fog_coord", GL_EXT_fog_coord_functions }, +{ "GL_EXT_gpu_program_parameters", GL_EXT_gpu_program_parameters_functions}, { "GL_EXT_packed_depth_stencil", NULL}, { "GL_EXT_secondary_color",GL_EXT_secondary_color_functions }, { "GL_EXT_stencil_wrap", NULL }, -- 1.7.3.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Marek Olšák : > r200 does support ARB_vertex_program. The backend is in r200_vertprog.c. I > think it has vertex shader 1.1 in D3D. > > The patch is wrong though. The extension should be listed in the > ARB_vp_extension array, not card_extensions. Thanks! I copied it from dri/r300/r300_context.c, where it's listed in the card_extensions as well. I'll fix the patch. > On Sun, Apr 17, 2011 at 4:57 AM, Jerome Glisse wrote: > > R200 hw doesn't support shader program (well what i wouldn't call what > > r200 has a shader). This is one of two extensions that I noticed are enabled in both the Matrox mga driver, as well as the r600g driver, but not in r200. The other one is APPLE_vertex_array_object. I've enabled it on r200 for testing, the demo works nicely. ./src/demos/vao_demo GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 GL_VERSION = 1.3 Mesa 7.11-devel (git-4ee40c3) Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Nicolas Kaiser : > * Marek Olšák : > > r200 does support ARB_vertex_program. The backend is in r200_vertprog.c. I > > think it has vertex shader 1.1 in D3D. > > > > The patch is wrong though. The extension should be listed in the > > ARB_vp_extension array, not card_extensions. > > Thanks! I copied it from dri/r300/r300_context.c, where it's listed > in the card_extensions as well. > > I'll fix the patch. Well, when I move it to the ARB_vp_extension array, it doesn't work: .src/tests/prog_parameter GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 GL_VERSION = 1.3 Mesa 7.11-devel (git-9dacbe2) GL_EXT_gpu_program_parameters not available. Testing glProgramEnvParameter4fvARB (count = 256)... Testing glProgramLocalParameter4fvARB (count = 1024)... PASS! I guess I'm doing something wrong. Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Marek Olšák : > Please test the attached patch. I have also enabled ARB_half_float_pixel and > ARB/APPLE_vertex_array_object. Thanks a lot! I'll do so. > @@ -455,7 +463,7 @@ GLboolean r200CreateContext( gl_api api, > driInitExtensions( ctx, blend_extensions, GL_FALSE ); > } > if(rmesa->radeon.radeonScreen->drmSupportsVertexProgram) > - driInitSingleExtension( ctx, ARB_vp_extension ); > + driInitExtensions( ctx, ARB_vp_extension, GL_FALSE ); Ah, I missed this one. That's why it didn't show last time. Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Marek Olšák : > Please test the attached patch. I have also enabled ARB_half_float_pixel and > ARB/APPLE_vertex_array_object. - GL_EXT_gpu_program_parameters: ./src/tests/prog_parameter GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 GL_VERSION = 1.3 Mesa 7.11-devel (git-699ecec) GL_EXT_gpu_program_parameters available, testing that path. Testing glProgramEnvParameter4fvARB (count = 256)... Testing glProgramEnvParameters4fvEXT (count = 256)... Testing glProgramLocalParameter4fvARB (count = 1024)... Testing glProgramLocalParameters4fvEXT (count = 1024)... PASS! - GL_APPLE_vertex_array_object: ./src/demos/vao_demo GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 GL_VERSION = 1.3 Mesa 7.11-devel (git-699ecec) Demo is working nicely. - GL_ARB_vertex_array_object: ./src/tests/bufferobj GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 Using GL_ARB_vertex_array_object: yes Demo is working nicely. - GL_ARB_half_float_pixel: I'm having problems with this one. (1a) According to the spec this extension, quote "will work with the OpenGL 1.5 Specification." However, glxinfo says it is at 1.3: OpenGL vendor string: Tungsten Graphics, Inc. OpenGL renderer string: Mesa DRI R200 (R200 514D) TCL DRI2 OpenGL version string: 1.3 Mesa 7.11-devel (git-699ecec) (1b) ./piglit-run.py -t draw-vertices-half-float tests/all.tests results/half-float.results skips the test: @test: general/draw-vertices-half-float info: @@@Returncode: 0\n\nErrors:\n\n\nOutput:\nRequires OpenGL 1.5\n (2) According to the spec this extension is tainted by patent claims, quote "SGI will not grant the ARB royalty-free use of this IP for use in OpenGL" The other three extensions look good to me. Thanks again! Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Marek Olšák : > The extension is driver-independent, it's implemented in the Mesa core, and > doesn't need any driver or hardware parts. It's not much useful without > ARB_texture_float though, which the hardware cannot do. > draw-vertices-half-float tests ARB_half_float_vertex only. > ARB_half_float_pixel can be tested by glean/pixelFormats. OK, sorry. Now I compared glean/pixelFormats, and this extension doesn't make any difference at my place. Neither any fix nor any regression. Which probably doesn't mean a lot, because there's a significant number of piglit failures either way. I found another test that appears to use ARB_half_float_pixel, fbo/fbo-rg, but it gets skipped for lack of GL_ARB_texture_rg. > There are more extensions r200 could support, but they would need a lot more > work than just enabling them, some of them are: > - GL_ARB_framebuffer_object > - GL_EXT_framebuffer_blit (subset of ARB_fbo) > - GL_EXT_framebuffer_multisample (subset of ARB_fbo, dummy implementation > like in the other drivers) > - GL_ARB_map_buffer_range > - GL_ARB_pixel_buffer_object Sounds interesting. For the moment, I guess I'll prepare to file a couple of bugs for problems I found. Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] r200: enable EXT_gpu_program_parameters
* Ian Romanick : > > ./src/demos/vao_demo > > GL_RENDERER = Mesa DRI R200 (R200 514D) TCL DRI2 > > GL_VERSION = 1.3 Mesa 7.11-devel (git-4ee40c3) > > Do we have VAO (either ARB or APPLE) in piglit? That would actually be > a more interesting test. The Mesa demos exercise extensions pretty > minimally in most cases. I found two piglit tests, general/vao-01 and general/vao-02. ./piglit-run.py -t vao tests/all.tests results/vao.results With Marek's patch, they pass: ./piglit-run.py -t vao tests/all.tests results/vao.enabled.results ./piglit-summary-html.py summary/compare.vao results/vao.results results/vao.enabled.results vao.results vao.enabled.results All 0/0 2/2 general 0/0 2/2 vao-01 skippass vao-02 skip pass Best regards, Nicolas Kaiser ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] r600g: fixed typo in shader error message
Fixed typo in shader error message. Signed-off-by: Nicolas Kaiser --- src/gallium/drivers/r600/r600_shader.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index e865f01..103b584 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -249,7 +249,7 @@ static int tgsi_is_supported(struct r600_shader_ctx *ctx) return -EINVAL; } if (i->Instruction.Saturate) { - R600_ERR("staturate unsupported\n"); + R600_ERR("saturate unsupported\n"); return -EINVAL; } if (i->Instruction.Predicate) { -- 1.7.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] gallium docs: fixed typos, added r600
Fixed some typos, added r600. Signed-off-by: Nicolas Kaiser --- src/gallium/docs/source/context.rst | 12 ++-- src/gallium/docs/source/cso/sampler.rst |6 +++--- src/gallium/docs/source/distro.rst |6 ++ src/gallium/docs/source/tgsi.rst| 10 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst index 4e35a4c..8f47ac5 100644 --- a/src/gallium/docs/source/context.rst +++ b/src/gallium/docs/source/context.rst @@ -76,7 +76,7 @@ If texture format is different than template format, it is said the texture is being cast to another format. Casting can be done only between compatible formats, that is formats that have matching component order and sizes. -Swizzle fields specify they way in which fetched texel components are placed +Swizzle fields specify the way in which fetched texel components are placed in the result register. For example, ``swizzle_r`` specifies what is going to be placed in first component of result register. @@ -124,7 +124,7 @@ include several layers), this surface need not be bound to the framebuffer. ``clear_depth_stencil`` clears a single depth, stencil or depth/stencil surface with the specified depth and stencil values (for combined depth/stencil buffers, -is is also possible to only clear one or the other part). While it is only +it is also possible to only clear one or the other part). While it is only possible to clear one surface at a time (which can include several layers), this surface need not be bound to the framebuffer. @@ -253,8 +253,8 @@ has completed, drawing will be predicated on the outcome of the query. If ``mode`` is PIPE_RENDER_COND_BY_REGION_WAIT or PIPE_RENDER_COND_BY_REGION_NO_WAIT rendering will be predicated as above -for the non-REGION modes but in the case that an occulusion query returns -a non-zero result, regions which were occluded may be ommitted by subsequent +for the non-REGION modes but in the case that an occlusion query returns +a non-zero result, regions which were occluded may be omitted by subsequent drawing commands. This can result in better performance with some GPUs. Normally, if the occlusion query returned a non-zero result subsequent drawing happens normally so fragments may be generated, shaded and @@ -306,8 +306,8 @@ is present) to be written to a buffer created with a ``PIPE_BIND_STREAM_OUTPUT`` flag. First a stream output state needs to be created with the -``create_stream_output_state`` call. It specific the details of what's being written, -to which buffer and with what kind of a writemask. +``create_stream_output_state`` call. It specifies the details of what's being +written, to which buffer and with what kind of a writemask. Then target buffers needs to be set with the call to ``set_stream_output_buffers`` which sets the buffers and the offsets from the start of those buffer to where diff --git a/src/gallium/docs/source/cso/sampler.rst b/src/gallium/docs/source/cso/sampler.rst index 9bbb784..24a6af8 100644 --- a/src/gallium/docs/source/cso/sampler.rst +++ b/src/gallium/docs/source/cso/sampler.rst @@ -28,7 +28,7 @@ The wrap modes are: border color is sampled when coords go outside the range [0,1]. * ``PIPE_TEX_WRAP_CLAMP``: The coord is clamped to the range [0,1] before scaling to the texture size. This corresponds to the legacy OpenGL GL_CLAMP - texture wrap mode. Historically, this mode hasn't acted consistantly across + texture wrap mode. Historically, this mode hasn't acted consistently across all graphics hardware. It sometimes acts like CLAMP_TO_EDGE or CLAMP_TO_BORDER. The behaviour may also vary depending on linear vs. nearest sampling mode. @@ -102,8 +102,8 @@ border_color RGBA color used for texel coordinates that are outside the [0,width-1], [0, height-1] or [0, depth-1] ranges. max_anisotropy -Maximum anistropy ratio to use when sampling from textures. For example, -if max_anistropy=4, a region of up to 1 by 4 texels will be sampled. +Maximum anisotropy ratio to use when sampling from textures. For example, +if max_anisotropy=4, a region of up to 1 by 4 texels will be sampled. Set to zero to disable anisotropic filtering. Any other setting enables anisotropic filtering, however it's not unexpected some drivers only will change their filtering with a setting of 2 and higher. diff --git a/src/gallium/docs/source/distro.rst b/src/gallium/docs/source/distro.rst index 6ba5a05..3bcc5d2 100644 --- a/src/gallium/docs/source/distro.rst +++ b/src/gallium/docs/source/distro.rst @@ -61,6 +61,12 @@ ATI r300 Driver for the ATI/AMD r300, r400, and r500 families of GPUs. +ATI r600 + + +Driver for the ATI/AMD r600, r700, and Evergreen families of GPUs. +Highly experimental. + .. _softpipe: Softpipe diff --git a/src/gallium/docs/source/tgsi.rst b/src/gal
Re: [Mesa-dev] TGSI thoughts
* Jakob Bornecrantz : > Comments please. ad patch 4: -These are the only instructions that can write to the address file. The are +These are the only instructions that can write to the address file. They are only available in vertex shaders and can only write and read from the X channel. Best regards, n. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev