Mesa (master): i965/vec4: Drop writemasks on scratch reads.
Module: Mesa Branch: master Commit: 23caba862a001f82ef352307a79bebf7ef910959 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23caba862a001f82ef352307a79bebf7ef910959 Author: Kenneth Graunke Date: Wed Dec 10 00:52:50 2014 -0800 i965/vec4: Drop writemasks on scratch reads. This code is complete nonsense and has apparently existed since I first implemented register spilling in the VS two years ago. Scratch reads are SEND messages, which ignore the destination writemask. The comment about "data that may not have been written to scratch" is also confusing - we always spill whole 4x2 registers, so such data simply does not exist. We can safely ignore the writemask. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp |8 1 file changed, 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp index 828a70e..e8e2185 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp @@ -335,14 +335,6 @@ vec4_visitor::spill_reg(int spill_reg_nr) inst->src[i].reg = virtual_grf_alloc(1); dst_reg temp = dst_reg(inst->src[i]); -/* Only read the necessary channels, to avoid overwriting the rest - * with data that may not have been written to scratch. - */ -temp.writemask = 0; -for (int c = 0; c < 4; c++) - temp.writemask |= (1 << BRW_GET_SWZ(inst->src[i].swizzle, c)); -assert(temp.writemask != 0); - emit_scratch_read(block, inst, temp, spill_reg, spill_offset); } } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: remove long dead 3Dnow optimisation
Module: Mesa Branch: master Commit: a3218e65d1e52469421226a17f2ba91a6b3e4bb8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3218e65d1e52469421226a17f2ba91a6b3e4bb8 Author: Timothy Arceri Date: Fri Dec 12 23:13:57 2014 +1100 mesa: remove long dead 3Dnow optimisation This code has been turned off for the last decade. Considering 3Dnow is obsolete it seems the bug will never be fixed so just remove it. Reviewed-by: Ian Romanick --- src/mesa/Makefile.sources |1 - src/mesa/x86/3dnow.c|7 - src/mesa/x86/3dnow_normal.S | 852 --- 3 files changed, 860 deletions(-) diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index f5e0182..7ac3bbc 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -560,7 +560,6 @@ X86_FILES = \ $(SRCDIR)x86/3dnow_xform2.S \ $(SRCDIR)x86/3dnow_xform3.S \ $(SRCDIR)x86/3dnow_xform4.S \ - $(SRCDIR)x86/3dnow_normal.S \ $(SRCDIR)x86/sse.h \ $(SRCDIR)x86/sse_xform1.S \ $(SRCDIR)x86/sse_xform2.S \ diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c index 4e3003b..c46cfbc 100644 --- a/src/mesa/x86/3dnow.c +++ b/src/mesa/x86/3dnow.c @@ -46,8 +46,6 @@ DECLARE_XFORM_GROUP( 3dnow, 2 ) DECLARE_XFORM_GROUP( 3dnow, 3 ) DECLARE_XFORM_GROUP( 3dnow, 4 ) -DECLARE_NORM_GROUP( 3dnow ) - extern void _ASMAPI _mesa_v16_3dnow_general_xform( GLfloat *first_vert, @@ -78,11 +76,6 @@ void _mesa_init_3dnow_transform_asm( void ) ASSIGN_XFORM_GROUP( 3dnow, 3 ); ASSIGN_XFORM_GROUP( 3dnow, 4 ); - /* There's a bug somewhere in the 3dnow_normal.S file that causes -* bad shading. Disable for now. - ASSIGN_NORM_GROUP( 3dnow ); - */ - #ifdef DEBUG_MATH _math_test_all_transform_functions( "3DNow!" ); _math_test_all_normal_transform_functions( "3DNow!" ); diff --git a/src/mesa/x86/3dnow_normal.S b/src/mesa/x86/3dnow_normal.S deleted file mode 100644 index ca95f25..000 --- a/src/mesa/x86/3dnow_normal.S +++ /dev/null @@ -1,852 +0,0 @@ - -/* - * Mesa 3-D graphics library - * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * 3Dnow assembly code by Holger Waechtler - */ - -#ifdef USE_3DNOW_ASM - -#include "assyntax.h" -#include "matypes.h" -#include "norm_args.h" - -SEG_TEXT - -#define M(i)REGOFF(i * 4, ECX) -#define STRIDE REGOFF(12, ESI) - - -ALIGNTEXT16 -GLOBL GLNAME(_mesa_3dnow_transform_normalize_normals) -HIDDEN(_mesa_3dnow_transform_normalize_normals) -GLNAME(_mesa_3dnow_transform_normalize_normals): - -#define FRAME_OFFSET 12 - -PUSH_L ( EDI ) -PUSH_L ( ESI ) -PUSH_L ( EBP ) - -MOV_L ( ARG_LENGTHS, EDI ) -MOV_L ( ARG_IN, ESI ) -MOV_L ( ARG_DEST, EAX ) -MOV_L ( REGOFF(V4F_COUNT, ESI), EBP ) /* dest->count = in->count */ -MOV_L ( EBP, REGOFF(V4F_COUNT, EAX) ) -MOV_L ( REGOFF(V4F_START, ESI), EDX ) /* in->start*/ -MOV_L ( REGOFF(V4F_START, EAX), EAX ) /* dest->start */ -MOV_L ( ARG_MAT, ECX ) -MOV_L ( REGOFF(MATRIX_INV, ECX), ECX ) /* mat->inv */ - -CMP_L ( CONST(0), EBP )/* count > 0 ?? */ -JE ( LLBL (G3TN_end) ) - -MOV_L ( REGOFF (V4F_COUNT, ESI), EBP ) -FEMMS - -PUSH_L ( EBP ) -PUSH_L ( EAX ) -PUSH_L ( EDX ) /* save counter & pointer for */ -/* the normalize pass */ -#undef FRAME_OFFSET -#define FRAME_OFFSET 24 - -MOVQ ( M(0), MM3 )/* m1 | m0 */ -MOVQ ( M(4), MM4 )/* m5 | m4 */ - -MOVD ( M(2), MM5 )/* | m2 */ -PUNPCKLDQ ( M(6), MM5 )/*
Mesa (master): ir_to_mesa: remove unused 'target' variable
Module: Mesa Branch: master Commit: 64bd1ac2b1a7f054ace4349667c69ca4b197e283 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64bd1ac2b1a7f054ace4349667c69ca4b197e283 Author: Brian Paul Date: Fri Dec 12 16:45:33 2014 -0700 ir_to_mesa: remove unused 'target' variable Reviewed-by: Ian Romanick --- src/mesa/program/ir_to_mesa.cpp |1 - 1 file changed, 1 deletion(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 68e2597..5196545 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2943,7 +2943,6 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) /* Lowering */ do_mat_op_to_vec(ir); -GLenum target = _mesa_shader_stage_to_program(prog->_LinkedShaders[i]->Stage); lower_instructions(ir, (MOD_TO_FRACT | DIV_TO_MUL_RCP | EXP_TO_EXP2 | LOG_TO_LOG2 | INT_DIV_TO_MUL_RCP | ((options->EmitNoPow) ? POW_TO_EXP2 : 0))); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: add missing closing brace for __cplusplus
Module: Mesa Branch: master Commit: 7dccc1a57aff9d65c3ddfa2fa4ede28e96f7764b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dccc1a57aff9d65c3ddfa2fa4ede28e96f7764b Author: Brian Paul Date: Fri Dec 12 16:45:33 2014 -0700 util: add missing closing brace for __cplusplus --- src/gallium/auxiliary/util/u_prim.h |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h index cf1a18f..b2dd44d 100644 --- a/src/gallium/auxiliary/util/u_prim.h +++ b/src/gallium/auxiliary/util/u_prim.h @@ -280,4 +280,10 @@ u_reduced_prims_for_vertices(int primitive, int vertices) const char *u_prim_name( unsigned pipe_prim ); + +#ifdef __cplusplus +} +#endif + + #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: whitespace, line wrap fixes in clear.c
Module: Mesa
Branch: master
Commit: e725dc0a74f594a4ff67579310e26651ecc5679d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e725dc0a74f594a4ff67579310e26651ecc5679d
Author: Brian Paul
Date: Fri Dec 12 16:45:33 2014 -0700
mesa: whitespace, line wrap fixes in clear.c
---
src/mesa/main/clear.c | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index f7f15cf..7eff07b 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -132,14 +132,15 @@ color_buffer_writes_enabled(const struct gl_context *ctx,
unsigned idx)
/**
* Clear buffers.
- *
+ *
* \param mask bit-mask indicating the buffers to be cleared.
*
- * Flushes the vertices and verifies the parameter. If __struct
gl_contextRec::NewState
- * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
- * etc. If the rasterization mode is set to GL_RENDER then requests the driver
- * to clear the buffers, via the dd_function_table::Clear callback.
- */
+ * Flushes the vertices and verifies the parameter.
+ * If __struct gl_contextRec::NewState is set then calls _mesa_update_state()
+ * to update gl_frame_buffer::_Xmin, etc. If the rasterization mode is set to
+ * GL_RENDER then requests the driver to clear the buffers, via the
+ * dd_function_table::Clear callback.
+ */
void GLAPIENTRY
_mesa_Clear( GLbitfield mask )
{
@@ -340,7 +341,8 @@ _mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const
GLint *value)
drawbuffer);
return;
}
- else if (ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer &&
!ctx->RasterDiscard) {
+ else if (ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer
+ && !ctx->RasterDiscard) {
/* Save current stencil clear value, set to 'value', do the
* stencil clear and restore the clear value.
* XXX in the future we may have a new ctx->Driver.ClearBuffer()
@@ -503,7 +505,8 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const
GLfloat *value)
drawbuffer);
return;
}
- else if (ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer &&
!ctx->RasterDiscard) {
+ else if (ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer
+ && !ctx->RasterDiscard) {
/* Save current depth clear value, set to 'value', do the
* depth clear and restore the clear value.
* XXX in the future we may have a new ctx->Driver.ClearBuffer()
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: remove obsolete comment on _mesa_ClearColor()
Module: Mesa Branch: master Commit: 0dcc7de20552b744e91a31d840f9d5af32b2039e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0dcc7de20552b744e91a31d840f9d5af32b2039e Author: Brian Paul Date: Fri Dec 12 16:45:33 2014 -0700 mesa: remove obsolete comment on _mesa_ClearColor() --- src/mesa/main/clear.c |4 1 file changed, 4 deletions(-) diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c index 7eff07b..4671ee2 100644 --- a/src/mesa/main/clear.c +++ b/src/mesa/main/clear.c @@ -58,10 +58,6 @@ _mesa_ClearIndex( GLfloat c ) * \param alpha alpha component. * * \sa glClearColor(). - * - * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor. On a - * change, flushes the vertices and notifies the driver via the - * dd_function_table::ClearColor callback. */ void GLAPIENTRY _mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: whitespace fixes, 80-column wrapping in texobj.c
Module: Mesa
Branch: master
Commit: caa13c59ef98d3ba7c87f06aa1403a0f3ea62277
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=caa13c59ef98d3ba7c87f06aa1403a0f3ea62277
Author: Brian Paul
Date: Fri Dec 12 16:45:33 2014 -0700
mesa: whitespace fixes, 80-column wrapping in texobj.c
---
src/mesa/main/texobj.c | 54 +---
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 923cf60..f0ff605 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -89,7 +89,7 @@ _mesa_lookup_texture_locked(struct gl_context *ctx, GLuint id)
*
* Called via ctx->Driver.NewTextureObject, unless overridden by a device
* driver.
- *
+ *
* \param shared the shared GL state structure to contain the texture object
* \param name integer name for the texture object
* \param target either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D,
@@ -268,7 +268,6 @@ _mesa_delete_texture_object(struct gl_context *ctx,
}
-
/**
* Copy texture object state from one texture object to another.
* Use for glPush/PopAttrib.
@@ -653,7 +652,8 @@ _mesa_test_texobj_completeness( const struct gl_context
*ctx,
if (height > 1 && t->Target != GL_TEXTURE_1D_ARRAY) {
height /= 2;
}
- if (depth > 1 && t->Target != GL_TEXTURE_2D_ARRAY && t->Target !=
GL_TEXTURE_CUBE_MAP_ARRAY) {
+ if (depth > 1 && t->Target != GL_TEXTURE_2D_ARRAY
+ && t->Target != GL_TEXTURE_CUBE_MAP_ARRAY) {
depth /= 2;
}
@@ -675,22 +675,25 @@ _mesa_test_texobj_completeness( const struct gl_context
*ctx,
return;
}
if (img->Width2 != width) {
- incomplete(t, MIPMAP, "TexImage[%d] bad width %u", i,
img->Width2);
+ incomplete(t, MIPMAP, "TexImage[%d] bad width %u", i,
+ img->Width2);
return;
}
if (img->Height2 != height) {
- incomplete(t, MIPMAP, "TexImage[%d] bad height %u", i,
img->Height2);
+ incomplete(t, MIPMAP, "TexImage[%d] bad height %u", i,
+ img->Height2);
return;
}
if (img->Depth2 != depth) {
- incomplete(t, MIPMAP, "TexImage[%d] bad depth %u", i,
img->Depth2);
+ incomplete(t, MIPMAP, "TexImage[%d] bad depth %u", i,
+ img->Depth2);
return;
}
/* Extra checks for cube textures */
if (face > 0) {
/* check that cube faces are the same size */
- if (img->Width2 != t->Image[0][i]->Width2 ||
+ if (img->Width2 != t->Image[0][i]->Width2 ||
img->Height2 != t->Image[0][i]->Height2) {
incomplete(t, MIPMAP, "CubeMap Image[n][i] bad size");
return;
@@ -698,7 +701,7 @@ _mesa_test_texobj_completeness( const struct gl_context
*ctx,
}
}
}
-
+
if (width == 1 && height == 1 && depth == 1) {
return; /* found smallest needed mipmap, all done! */
}
@@ -950,6 +953,7 @@ _mesa_total_texture_memory(struct gl_context *ctx)
return total;
}
+
static struct gl_texture_object *
invalidate_tex_image_error_check(struct gl_context *ctx, GLuint texture,
GLint level, const char *name)
@@ -1022,7 +1026,7 @@ invalidate_tex_image_error_check(struct gl_context *ctx,
GLuint texture,
* Calls _mesa_HashFindFreeKeyBlock() to find a block of free texture
* IDs which are stored in \p textures. Corresponding empty texture
* objects are also generated.
- */
+ */
void GLAPIENTRY
_mesa_GenTextures( GLsizei n, GLuint *textures )
{
@@ -1155,6 +1159,7 @@ unbind_texobj_from_image_units(struct gl_context *ctx,
}
}
+
/**
* Unbinds all textures bound to the given texture image unit.
*/
@@ -1178,6 +1183,7 @@ unbind_textures_from_unit(struct gl_context *ctx, GLuint
unit)
}
}
+
/**
* Delete named textures.
*
@@ -1305,10 +1311,10 @@ _mesa_tex_target_to_index(const struct gl_context *ctx,
GLenum target)
/**
* Bind a named texture to a texturing target.
- *
+ *
* \param target texture target.
* \param texName texture name.
- *
+ *
* \sa glBindTexture().
*
* Determines the old texture object bound and returns immediately if rebinding
@@ -1350,7 +1356,9 @@ _mesa_BindTexture( GLenum target, GLuint texName )
if (newTexObj) {
/* error checking */
if (newTexObj->Target != 0 && newTexObj->Target != target) {
-/* the named texture object's target doesn't match the given
target */
+/* The named texture object's target doesn't match the
+ * given target
+
Mesa (master): 81 new commits
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f3aeb53337615b888e605635ac9660e4ada354c Author: Matt Turner Date: Fri Dec 12 12:09:34 2014 -0800 mapi: Move rules for generating glapi_mapi_tmp.h out of the conditional. Allows distcheck to succeed, regardless of how Mesa has been configured. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ea4b25fba39eb2f26dad24acb55f4c2166f40d1 Author: Matt Turner Date: Sun Dec 7 15:23:47 2014 -0800 glsl: Add dist-hook to delete glcpp test *.out files. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a29ae0b3ddce0f4cda633d3be3f7380178522bbf Author: Matt Turner Date: Sun Dec 7 23:43:00 2014 -0800 glcpp: Make tests write .out files to builddir. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=75c7a7114fc94b17aaadb6d737d2b5fc92bf6240 Author: Matt Turner Date: Sun Dec 7 15:13:45 2014 -0800 gallium: Remove Android files from distribution. Android builds Mesa from git, so there don't need to be in the tarball. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=00eadb77e60fdf794050b025ebaa80913dd32d97 Author: Matt Turner Date: Sun Dec 7 15:10:39 2014 -0800 osmesa: Add osmesa.def to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92f89f0c0cba55bf9903537f2b18fd6c42223a7e Author: Matt Turner Date: Sun Dec 7 14:51:57 2014 -0800 x86-64: Remove calling_convention.txt. It just details the x86-64 calling convention. No need for this in Mesa. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e191e88290b98817fb0477c1e01bac9e785e473 Author: Matt Turner Date: Sun Dec 7 14:51:23 2014 -0800 drivers/x11: Add headers to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd6a43f07cbfef58185b530da5007c7411f3dbef Author: Matt Turner Date: Sun Dec 7 14:50:33 2014 -0800 drivers/windows: Add to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d51150a98a0f4edbc99f4cf6f5b41332638b862e Author: Matt Turner Date: Sun Dec 7 14:48:15 2014 -0800 mesa: Add autogen.sh to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4401e2b2191b51033aa7deff57ed42a51b6ca0e5 Author: Matt Turner Date: Sun Dec 7 14:27:22 2014 -0800 mapi: Add ABI-check tests to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43ac31dff0fb359f4be3f919aec70e8b632ac377 Author: Matt Turner Date: Sun Dec 7 14:12:33 2014 -0800 mesa: Add notes/readme files to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a208e9b520ae2d854ae588fea309763b2eaad616 Author: Matt Turner Date: Sun Dec 7 14:08:58 2014 -0800 util: Wire up u_atomic_test. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=952b324b23b1ff8596e3cb168c16a1feb372b32b Author: Matt Turner Date: Sun Dec 7 14:07:32 2014 -0800 mesa: Add scons files to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6502aaa58d854def4c93dc25154a6c97b159fb4 Author: Matt Turner Date: Sun Dec 7 14:00:03 2014 -0800 haiku: Add files to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe2c72e6ec79d4dd671639c82e25ed2c7036b14b Author: Matt Turner Date: Sun Dec 7 13:33:38 2014 -0800 egl: Add files to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=feb741dc7c09a5f858fe043f0ff386bbb4715b7f Author: Matt Turner Date: Sun Dec 7 13:32:40 2014 -0800 egl+gbm: Add symbols-check tests to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ac98e729650b2809785bfc673ea1294d849417f Author: Matt Turner Date: Sun Dec 7 13:30:24 2014 -0800 docs: Add to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=55983a1eaad713398b9159e4dfc9eb4a8bf67bbd Author: Matt Turner Date: Sun Dec 7 13:27:35 2014 -0800 glapi/gen: Add gl_and_glX_API.xml to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a26c824890b6a84ce973723994c6e9be25bb7e8 Author: Matt Turner Date: Sun Dec 7 13:24:28 2014 -0800 glx/apple: Add headers to distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a267212a4d2cad366f6e90500e81840028246b2a Author: Matt Turner Date: Sun Dec 7 13:21:53 2014 -0800 mesa: Add a dist hook to remove .gitignore files from distribution. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b662d5282f77bec415ff430b94a5eb925d3f74e2 Author: Matt Turner Date: Sun Dec 7 11:30:58 2014 -0800 mesa: Add clean-local rule to remove .lib links. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e2577f2a9289417706bf190c5f12f33d2628b68 Author: Matt Turner Date: Sun Dec 7 11:29:55 2014 -0800 glsl: Add clean-local rule to delete glcpp test output. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e643fd3b4a0f1bf00a421d1c8eb42ed1feea524a Author: Matt Turner Date: Sun Dec 7 11:29:00 2014 -0800
Mesa (master): vc4: Fix referencing of sync objects.
Module: Mesa
Branch: master
Commit: e5eaf8ec600b73de7f52555ce1c9a74883dba941
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5eaf8ec600b73de7f52555ce1c9a74883dba941
Author: Eric Anholt
Date: Fri Dec 12 00:06:21 2014 -0800
vc4: Fix referencing of sync objects.
While the pipe_reference_* helpers set the pointer, a bare pipe_reference
doesn't. Fixes 5 ARB_sync tests.
---
src/gallium/drivers/vc4/vc4_fence.c |1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/drivers/vc4/vc4_fence.c
b/src/gallium/drivers/vc4/vc4_fence.c
index c081d51..01906cd 100644
--- a/src/gallium/drivers/vc4/vc4_fence.c
+++ b/src/gallium/drivers/vc4/vc4_fence.c
@@ -56,6 +56,7 @@ vc4_fence_reference(struct pipe_screen *pscreen,
if (pipe_reference(&(*p)->reference, &f->reference)) {
free(old);
}
+*p = f;
}
static boolean
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: Unbreak usage of assert()/debug_assert() inside expressions.
Module: Mesa
Branch: master
Commit: e75e677d288e67c3c05e7b8744e08cd73bdcbed8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e75e677d288e67c3c05e7b8744e08cd73bdcbed8
Author: José Fonseca
Date: Fri Dec 12 14:06:17 2014 +
util: Unbreak usage of assert()/debug_assert() inside expressions.
f0ba7d897d1c22202531acb70f134f2edc30557d made debug_assert()/assert()
unsafe for expressions, but only now that u_atomic.h started to rely on
them for Windows that this became an issue.
This fixes non-debug builds with MSVC.
Reviewed-by: Brian Paul
---
src/gallium/auxiliary/util/u_debug.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/util/u_debug.h
b/src/gallium/auxiliary/util/u_debug.h
index badd5e2..4c22fdf 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -185,7 +185,7 @@ void _debug_assert_fail(const char *expr,
#ifdef DEBUG
#define debug_assert(expr) ((expr) ? (void)0 : _debug_assert_fail(#expr,
__FILE__, __LINE__, __FUNCTION__))
#else
-#define debug_assert(expr) do { } while (0 && (expr))
+#define debug_assert(expr) (void)(0 && (expr))
#endif
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
