brkho
/
mesa
Watch 1
Star 0
Fork 0
Code Releases 562 Wiki Activity
Browse Source

Merge branch '7.8' 

Conflicts:

	Makefile
	src/gallium/state_trackers/glx/xlib/xm_api.c
	src/mesa/drivers/dri/intel/intel_blit.c
	src/mesa/drivers/dri/intel/intel_pixel_copy.c
	src/mesa/main/version.h
tags/mesa-7.9-rc1
Brian Paul 16 years ago
parent
83f4c444f4 ff54af530b
commit
2689dd304c
4 changed files with 230 additions and 189 deletions
Unified View Show Diff Stats
  1. 9
    0
      Makefile
  2. 72
    187
      src/gallium/drivers/softpipe/sp_quad_depth_test.c
  3. 147
    0
      src/gallium/drivers/softpipe/sp_quad_depth_test_tmp.h
  4. 2
    2
      windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj

+ 9
- 0
Makefile View File

$(DIRECTORY)/src/gallium/*/Makefile \ $(DIRECTORY)/src/gallium/*/Makefile \
$(DIRECTORY)/src/gallium/*/SConscript \ $(DIRECTORY)/src/gallium/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/Makefile \ $(DIRECTORY)/src/gallium/*/*/Makefile \
$(DIRECTORY)/src/gallium/*/*/Makefile.egl \
$(DIRECTORY)/src/gallium/*/*/Makefile.template \ $(DIRECTORY)/src/gallium/*/*/Makefile.template \
$(DIRECTORY)/src/gallium/*/*/SConscript \ $(DIRECTORY)/src/gallium/*/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/*.[ch] \ $(DIRECTORY)/src/gallium/*/*/*.[ch] \
$(DIRECTORY)/progs/demos/*.cxx \ $(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \ $(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \ $(DIRECTORY)/progs/demos/README \
$(DIRECTORY)/progs/egl/Makefile \
$(DIRECTORY)/progs/egl/*.[ch] \
$(DIRECTORY)/progs/es1/*/Makefile \
$(DIRECTORY)/progs/es1/*/*.[ch] \
$(DIRECTORY)/progs/es2/*/Makefile \
$(DIRECTORY)/progs/es2/*/*.[ch] \
$(DIRECTORY)/progs/openvg/*/Makefile \
$(DIRECTORY)/progs/openvg/*/*.[ch] \
$(DIRECTORY)/progs/fbdev/Makefile \ $(DIRECTORY)/progs/fbdev/Makefile \
$(DIRECTORY)/progs/fbdev/glfbdevtest.c \ $(DIRECTORY)/progs/fbdev/glfbdevtest.c \
$(DIRECTORY)/progs/objviewer/*.[ch] \ $(DIRECTORY)/progs/objviewer/*.[ch] \

+ 72
- 187
src/gallium/drivers/softpipe/sp_quad_depth_test.c View File

/************************************************************************** /**************************************************************************
* *
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* Copyright 2010 VMware, Inc.
* All Rights Reserved. * All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/


/** /**
* \brief Quad depth testing
* \brief Quad depth / stencil testing
*/ */


#include "pipe/p_defines.h" #include "pipe/p_defines.h"
} }
} }


/* If the shader has not been run, interpolate the depth values

/**
* If the shader has not been run, interpolate the depth values
* ourselves. * ourselves.
*/ */
static void static void
} }




/**
* Compute the depth_data::qzzzz[] values from the float fragment Z values.
*/
static void static void
convert_quad_depth( struct depth_data *data, convert_quad_depth( struct depth_data *data,
const struct quad_header *quad ) const struct quad_header *quad )






/**
* Write data->bzzzz[] values and data->stencilVals into the Z/stencil buffer.
*/
static void static void
write_depth_stencil_values( struct depth_data *data, write_depth_stencil_values( struct depth_data *data,
struct quad_header *quad ) struct quad_header *quad )







/** Only 8-bit stencil supported */ /** Only 8-bit stencil supported */
#define STENCIL_MAX 0xff #define STENCIL_MAX 0xff






/*
/**
* To increase efficiency, we should probably have multiple versions * To increase efficiency, we should probably have multiple versions
* of this function that are specifically for Z16, Z32 and FP Z buffers. * of this function that are specifically for Z16, Z32 and FP Z buffers.
* Try to effectively do that with codegen... * Try to effectively do that with codegen...
*/ */

static boolean static boolean
depth_test_quad(struct quad_stage *qs, depth_test_quad(struct quad_stage *qs,
struct depth_data *data, struct depth_data *data,
wrtMask = softpipe->depth_stencil->stencil[face].writemask; wrtMask = softpipe->depth_stencil->stencil[face].writemask;
valMask = softpipe->depth_stencil->stencil[face].valuemask; valMask = softpipe->depth_stencil->stencil[face].valuemask;



/* do the stencil test first */ /* do the stencil test first */
{ {
unsigned passMask, failMask; unsigned passMask, failMask;




#define ALPHATEST( FUNC, COMP ) \ #define ALPHATEST( FUNC, COMP ) \
static int \
static int \
alpha_test_quads_##FUNC( struct quad_stage *qs, \ alpha_test_quads_##FUNC( struct quad_stage *qs, \
struct quad_header *quads[], \ struct quad_header *quads[], \
unsigned nr ) \ unsigned nr ) \
} }
} }



static unsigned mask_count[16] = static unsigned mask_count[16] =
{ {
0, /* 0x0 */ 0, /* 0x0 */






/**
* General depth/stencil test function. Used when there's no fast-path.
*/
static void static void
depth_test_quads_fallback(struct quad_stage *qs, depth_test_quads_fallback(struct quad_stage *qs,
struct quad_header *quads[], struct quad_header *quads[],
write_depth_stencil_values(&data, quads[i]); write_depth_stencil_values(&data, quads[i]);
} }



quads[pass++] = quads[i]; quads[pass++] = quads[i];
} }






/** /**
* Special-case Z testing for 16-bit Zbuffer, PIPE_FUNC_LESS and
* Z buffer writes enabled.
*
* NOTE: there's no guarantee that the quads are sequentially side by
* side. The fragment shader may have culled some quads, etc. Sliver
* triangles may generate non-sequential quads.
*/
static void
depth_interp_z16_less_write(struct quad_stage *qs,
struct quad_header *quads[],
unsigned nr)
{
unsigned i, pass = 0;
const unsigned ix = quads[0]->input.x0;
const unsigned iy = quads[0]->input.y0;
const float fx = (float) ix;
const float fy = (float) iy;
const float dzdx = quads[0]->posCoef->dadx[2];
const float dzdy = quads[0]->posCoef->dady[2];
const float z0 = quads[0]->posCoef->a0[2] + dzdx * fx + dzdy * fy;
struct softpipe_cached_tile *tile;
ushort (*depth16)[TILE_SIZE];
ushort init_idepth[4], idepth[4], depth_step;
const float scale = 65535.0;

/* compute scaled depth of the four pixels in first quad */
init_idepth[0] = (ushort)((z0) * scale);
init_idepth[1] = (ushort)((z0 + dzdx) * scale);
init_idepth[2] = (ushort)((z0 + dzdy) * scale);
init_idepth[3] = (ushort)((z0 + dzdx + dzdy) * scale);

depth_step = (ushort)(dzdx * scale);

tile = sp_get_cached_tile(qs->softpipe->zsbuf_cache, ix, iy);

for (i = 0; i < nr; i++) {
const unsigned outmask = quads[i]->inout.mask;
const int dx = quads[i]->input.x0 - ix;
unsigned mask = 0;

/* compute depth for this quad */
idepth[0] = init_idepth[0] + dx * depth_step;
idepth[1] = init_idepth[1] + dx * depth_step;
idepth[2] = init_idepth[2] + dx * depth_step;
idepth[3] = init_idepth[3] + dx * depth_step;

depth16 = (ushort (*)[TILE_SIZE])
&tile->data.depth16[iy % TILE_SIZE][(ix + dx)% TILE_SIZE];

if ((outmask & 1) && idepth[0] < depth16[0][0]) {
depth16[0][0] = idepth[0];
mask |= (1 << 0);
}

if ((outmask & 2) && idepth[1] < depth16[0][1]) {
depth16[0][1] = idepth[1];
mask |= (1 << 1);
}

if ((outmask & 4) && idepth[2] < depth16[1][0]) {
depth16[1][0] = idepth[2];
mask |= (1 << 2);
}

if ((outmask & 8) && idepth[3] < depth16[1][1]) {
depth16[1][1] = idepth[3];
mask |= (1 << 3);
}

quads[i]->inout.mask = mask;
if (quads[i]->inout.mask)
quads[pass++] = quads[i];
}

if (pass)
qs->next->run(qs->next, quads, pass);

}


/**
* Special-case Z testing for 16-bit Zbuffer, PIPE_FUNC_LEQUAL and
* Z buffer writes enabled.
*
* NOTE: there's no guarantee that the quads are sequentially side by
* side. The fragment shader may have culled some quads, etc. Sliver
* triangles may generate non-sequential quads.
* Special-case Z testing for 16-bit Zbuffer and Z buffer writes enabled.
*/ */
static void
depth_interp_z16_lequal_write(struct quad_stage *qs,
struct quad_header *quads[],
unsigned nr)
{
unsigned i, pass = 0;
const unsigned ix = quads[0]->input.x0;
const unsigned iy = quads[0]->input.y0;
const float fx = (float) ix;
const float fy = (float) iy;
const float dzdx = quads[0]->posCoef->dadx[2];
const float dzdy = quads[0]->posCoef->dady[2];
const float z0 = quads[0]->posCoef->a0[2] + dzdx * fx + dzdy * fy;
struct softpipe_cached_tile *tile;
ushort (*depth16)[TILE_SIZE];
ushort init_idepth[4], idepth[4], depth_step;
const float scale = 65535.0;

/* compute scaled depth of the four pixels in first quad */
init_idepth[0] = (ushort)((z0) * scale);
init_idepth[1] = (ushort)((z0 + dzdx) * scale);
init_idepth[2] = (ushort)((z0 + dzdy) * scale);
init_idepth[3] = (ushort)((z0 + dzdx + dzdy) * scale);

depth_step = (ushort)(dzdx * scale);


tile = sp_get_cached_tile(qs->softpipe->zsbuf_cache, ix, iy);

for (i = 0; i < nr; i++) {
const unsigned outmask = quads[i]->inout.mask;
const int dx = quads[i]->input.x0 - ix;
unsigned mask = 0;
/* compute depth for this quad */
idepth[0] = init_idepth[0] + dx * depth_step;
idepth[1] = init_idepth[1] + dx * depth_step;
idepth[2] = init_idepth[2] + dx * depth_step;
idepth[3] = init_idepth[3] + dx * depth_step;

depth16 = (ushort (*)[TILE_SIZE])
&tile->data.depth16[iy % TILE_SIZE][(ix + dx)% TILE_SIZE];

if ((outmask & 1) && idepth[0] <= depth16[0][0]) {
depth16[0][0] = idepth[0];
mask |= (1 << 0);
}

if ((outmask & 2) && idepth[1] <= depth16[0][1]) {
depth16[0][1] = idepth[1];
mask |= (1 << 1);
}

if ((outmask & 4) && idepth[2] <= depth16[1][0]) {
depth16[1][0] = idepth[2];
mask |= (1 << 2);
}

if ((outmask & 8) && idepth[3] <= depth16[1][1]) {
depth16[1][1] = idepth[3];
mask |= (1 << 3);
}
#define NAME depth_interp_z16_less_write
#define OPERATOR <
#include "sp_quad_depth_test_tmp.h"


depth16 = (ushort (*)[TILE_SIZE]) &depth16[0][2];
#define NAME depth_interp_z16_equal_write
#define OPERATOR ==
#include "sp_quad_depth_test_tmp.h"


quads[i]->inout.mask = mask;
if (quads[i]->inout.mask)
quads[pass++] = quads[i];
}
#define NAME depth_interp_z16_lequal_write
#define OPERATOR <=
#include "sp_quad_depth_test_tmp.h"


if (pass)
qs->next->run(qs->next, quads, pass);
#define NAME depth_interp_z16_greater_write
#define OPERATOR >
#include "sp_quad_depth_test_tmp.h"


}
#define NAME depth_interp_z16_notequal_write
#define OPERATOR !=
#include "sp_quad_depth_test_tmp.h"


#define NAME depth_interp_z16_gequal_write
#define OPERATOR >=
#include "sp_quad_depth_test_tmp.h"


#define NAME depth_interp_z16_always_write
#define ALWAYS 1
#include "sp_quad_depth_test_tmp.h"








boolean occlusion = qs->softpipe->active_query_count; boolean occlusion = qs->softpipe->active_query_count;


/* default */
qs->run = depth_test_quads_fallback;

/* look for special cases */
if (!alpha && if (!alpha &&
!depth && !depth &&
!stencil) { !stencil) {
!occlusion && !occlusion &&
!stencil) !stencil)
{ {
switch (depthfunc) {
case PIPE_FUNC_LESS:
switch (qs->softpipe->framebuffer.zsbuf->format) {
case PIPE_FORMAT_Z16_UNORM:
if (qs->softpipe->framebuffer.zsbuf->format == PIPE_FORMAT_Z16_UNORM) {
switch (depthfunc) {
case PIPE_FUNC_NEVER:
qs->run = depth_test_quads_fallback;
break;
case PIPE_FUNC_LESS:
qs->run = depth_interp_z16_less_write; qs->run = depth_interp_z16_less_write;
break; break;
default:
qs->run = depth_test_quads_fallback;
case PIPE_FUNC_EQUAL:
qs->run = depth_interp_z16_equal_write;
break; break;
}
break;
case PIPE_FUNC_LEQUAL:
switch (qs->softpipe->framebuffer.zsbuf->format) {
case PIPE_FORMAT_Z16_UNORM:
case PIPE_FUNC_LEQUAL:
qs->run = depth_interp_z16_lequal_write; qs->run = depth_interp_z16_lequal_write;
break; break;
case PIPE_FUNC_GREATER:
qs->run = depth_interp_z16_greater_write;
break;
case PIPE_FUNC_NOTEQUAL:
qs->run = depth_interp_z16_notequal_write;
break;
case PIPE_FUNC_GEQUAL:
qs->run = depth_interp_z16_gequal_write;
break;
case PIPE_FUNC_ALWAYS:
qs->run = depth_interp_z16_always_write;
break;
default: default:
qs->run = depth_test_quads_fallback; qs->run = depth_test_quads_fallback;
break; break;
} }
break;
default:
qs->run = depth_test_quads_fallback;
} }
} }
else {
qs->run = depth_test_quads_fallback;
}



/* next quad/fragment stage */
qs->run( qs, quads, nr ); qs->run( qs, quads, nr );
} }








static void depth_test_begin(struct quad_stage *qs)
static void
depth_test_begin(struct quad_stage *qs)
{ {
qs->run = choose_depth_test; qs->run = choose_depth_test;
qs->next->begin(qs->next); qs->next->begin(qs->next);
} }




static void depth_test_destroy(struct quad_stage *qs)
static void
depth_test_destroy(struct quad_stage *qs)
{ {
FREE( qs ); FREE( qs );
} }




struct quad_stage *sp_quad_depth_test_stage( struct softpipe_context *softpipe )
struct quad_stage *
sp_quad_depth_test_stage(struct softpipe_context *softpipe)
{ {
struct quad_stage *stage = CALLOC_STRUCT(quad_stage); struct quad_stage *stage = CALLOC_STRUCT(quad_stage);



+ 147
- 0
src/gallium/drivers/softpipe/sp_quad_depth_test_tmp.h View File

/**************************************************************************
*
* Copyright 2010 VMware, Inc. 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, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/


/*
* Template for generating Z test functions
* Only PIPE_FORMAT_Z16_UNORM supported at this time.
*/


#ifndef NAME
#error "NAME is not defined!"
#endif

#if !defined(OPERATOR) && !defined(ALWAYS)
#error "neither OPERATOR nor ALWAYS is defined!"
#endif


/*
* NOTE: there's no guarantee that the quads are sequentially side by
* side. The fragment shader may have culled some quads, etc. Sliver
* triangles may generate non-sequential quads.
*/
static void
NAME(struct quad_stage *qs,
struct quad_header *quads[],
unsigned nr)
{
unsigned i, pass = 0;
const unsigned ix = quads[0]->input.x0;
const unsigned iy = quads[0]->input.y0;
const float fx = (float) ix;
const float fy = (float) iy;
const float dzdx = quads[0]->posCoef->dadx[2];
const float dzdy = quads[0]->posCoef->dady[2];
const float z0 = quads[0]->posCoef->a0[2] + dzdx * fx + dzdy * fy;
struct softpipe_cached_tile *tile;
ushort (*depth16)[TILE_SIZE];
ushort init_idepth[4], idepth[4], depth_step;
const float scale = 65535.0;

/* compute scaled depth of the four pixels in first quad */
init_idepth[0] = (ushort)((z0) * scale);
init_idepth[1] = (ushort)((z0 + dzdx) * scale);
init_idepth[2] = (ushort)((z0 + dzdy) * scale);
init_idepth[3] = (ushort)((z0 + dzdx + dzdy) * scale);

depth_step = (ushort)(dzdx * scale);

tile = sp_get_cached_tile(qs->softpipe->zsbuf_cache, ix, iy);

for (i = 0; i < nr; i++) {
const unsigned outmask = quads[i]->inout.mask;
const int dx = quads[i]->input.x0 - ix;
unsigned mask = 0;
/* compute depth for this quad */
idepth[0] = init_idepth[0] + dx * depth_step;
idepth[1] = init_idepth[1] + dx * depth_step;
idepth[2] = init_idepth[2] + dx * depth_step;
idepth[3] = init_idepth[3] + dx * depth_step;

depth16 = (ushort (*)[TILE_SIZE])
&tile->data.depth16[iy % TILE_SIZE][(ix + dx)% TILE_SIZE];

#ifdef ALWAYS
if (outmask & 1) {
depth16[0][0] = idepth[0];
mask |= (1 << 0);
}

if (outmask & 2) {
depth16[0][1] = idepth[1];
mask |= (1 << 1);
}

if (outmask & 4) {
depth16[1][0] = idepth[2];
mask |= (1 << 2);
}

if (outmask & 8) {
depth16[1][1] = idepth[3];
mask |= (1 << 3);
}
#else
/* Note: OPERATOR appears here: */
if ((outmask & 1) && (idepth[0] OPERATOR depth16[0][0])) {
depth16[0][0] = idepth[0];
mask |= (1 << 0);
}

if ((outmask & 2) && (idepth[1] OPERATOR depth16[0][1])) {
depth16[0][1] = idepth[1];
mask |= (1 << 1);
}

if ((outmask & 4) && (idepth[2] OPERATOR depth16[1][0])) {
depth16[1][0] = idepth[2];
mask |= (1 << 2);
}

if ((outmask & 8) && (idepth[3] OPERATOR depth16[1][1])) {
depth16[1][1] = idepth[3];
mask |= (1 << 3);
}
#endif

depth16 = (ushort (*)[TILE_SIZE]) &depth16[0][2];

quads[i]->inout.mask = mask;
if (quads[i]->inout.mask)
quads[pass++] = quads[i];
}

if (pass)
qs->next->run(qs->next, quads, pass);
}


#undef NAME
#undef OPERATOR
#undef ALWAYS

+ 2
- 2
windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj View File

/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

Write Preview
Loading…
Cancel
Save