diff options
| author | Dylan Baker <[email protected]> | 2018-09-14 12:57:32 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2020-04-21 11:09:04 -0700 |
| commit | 8e3696137f2cb7b4f5a3824f26186ecbb06f9282 (patch) | |
| tree | 4494df8d138aaf2bab2feafa832f68e9fdf9bfb1 /src/mesa/swrast/s_span.c | |
| parent | 289f02d1d5990e052e21eb250f6d40b47d6eb12f (diff) | |
remove final imports.h and imports.c bits
This moves the fi_types to a new mesa_private.h and removes the
imports.c file. The vast majority of this patch is just removing
pound includes of imports.h and fixing up the recursive includes.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
Diffstat (limited to 'src/mesa/swrast/s_span.c')
| -rw-r--r-- | src/mesa/swrast/s_span.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index cd97d0416e5..2eb22539a0f 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -37,7 +37,7 @@ #include "main/format_pack.h" #include "main/format_unpack.h" #include "main/macros.h" -#include "util/imports.h" + #include "main/image.h" #include "main/samplerobj.h" #include "main/state.h" @@ -74,7 +74,7 @@ _swrast_span_default_attribs(struct gl_context *ctx, SWspan *span) if (ctx->DrawBuffer->Visual.depthBits <= 16) span->z = FloatToFixed(ctx->Current.RasterPos[2] * depthMax + 0.5F); else { - GLfloat tmpf = ctx->Current.RasterPos[2] * depthMax; + GLfloat tmpf = ctx->Current.RasterPos[2] * depthMax; tmpf = MIN2(tmpf, depthMax); span->z = (GLint)tmpf; } @@ -390,7 +390,7 @@ _swrast_span_interpolate_z( const struct gl_context *ctx, SWspan *span ) if (ctx->DrawBuffer->Visual.depthBits <= 16) { GLfixed zval = span->z; - GLuint *z = span->array->z; + GLuint *z = span->array->z; for (i = 0; i < n; i++) { z[i] = FixedToInt(zval); zval += span->zStep; @@ -1314,7 +1314,7 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span) { const GLuint numBuffers = fb->_NumColorDrawBuffers; const struct gl_program *fp = ctx->FragmentProgram._Current; - const GLboolean multiFragOutputs = + const GLboolean multiFragOutputs = _swrast_use_fragment_program(ctx) && fp->info.outputs_written >= (1 << FRAG_RESULT_DATA0); /* Save srcColorType because convert_color_type() can change it */ |