From 3e6b3a9f0eb47aed6b0bc230daf5ee074100376d Mon Sep 17 00:00:00 2001 From: Mark Mueller Date: Mon, 27 Jan 2014 12:13:15 -0800 Subject: minor updates and fixes --- src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 10 +---- src/mesa/drivers/dri/i965/brw_surface_formats.c | 14 +++--- src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 +- src/mesa/drivers/dri/i965/intel_tex_image.c | 25 ----------- src/mesa/main/formats.c | 13 +----- src/mesa/main/formats.h | 3 +- src/mesa/main/texformat.c | 58 ++++++++++++------------- 7 files changed, 42 insertions(+), 83 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp index 9eae52b6ba..97fd5f83a8 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp @@ -357,12 +357,6 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw, return true; } - /* BLORP is not supported before Gen6. */ - if (brw->gen < 6) { - DBG("%s: Older Gen not supported.\n", __FUNCTION__); - return false; - } - if (dst_image->Width % 16) { _mesa_debug(&brw->ctx, "%s: Blorp Path currently requires texture widths to be on 16 pixel boundry.\n", __FUNCTION__); return false; @@ -2336,7 +2330,8 @@ brw_blorp_blit_params::compare_source_to_target(struct brw_context *brw, case GL_RGB: testPassed = (GL_RED == baseDestinationFormat || GL_R == baseDestinationFormat || - GL_RG == baseDestinationFormat); + GL_RG == baseDestinationFormat || + GL_RGBA == baseDestinationFormat); break; case GL_RGBA: switch (baseDestinationFormat) { @@ -2353,7 +2348,6 @@ brw_blorp_blit_params::compare_source_to_target(struct brw_context *brw, case GL_ALPHA: case GL_INTENSITY: case GL_LUMINANCE: - case GL_LUMINANCE_ALPHA: testPassed = true; } break; diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index e39c86bbf7..47dc49da47 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -343,7 +343,7 @@ brw_format_for_mesa_format(gl_format mesa_format) * as well as flags to indicate any additional processing that may be required by * blorp, and/or limitiations with some formats. */ - static const struct format_translator table[MESA_PRIVATE_FORMAT_COUNT] = + static const struct format_translator table[MESA_GL_USER_FORMAT_COUNT] = { [MESA_FORMAT_RGBA8888] = {BRW_SURFACEFORMAT_NONE, /* shadow render target */ BRW_SURFACEFORMAT_R8G8B8A8_UNORM, /* shadow sample target */ @@ -463,7 +463,7 @@ brw_format_for_mesa_format(gl_format mesa_format) BRW_SURFACEFORMAT_B8G8R8A8_UNORM, raw_sample | depth_format | sample_swizzle_all}, [MESA_FORMAT_S8_Z24] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM, - BRW_SURFACEFORMAT_I24X8_UNORM, + BRW_SURFACEFORMAT_R24_UNORM_X8_TYPELESS, raw_sample | depth_format}, /* It appears that Z16 is slower than Z24 (on Intel Ivybridge and newer * hardware at least), so there's no real reason to prefer it unless you're @@ -478,10 +478,10 @@ brw_format_for_mesa_format(gl_format mesa_format) * desktop_gl_sel flag. */ [MESA_FORMAT_Z16] = {BRW_SURFACEFORMAT_R16_UNORM, - BRW_SURFACEFORMAT_I16_UNORM, + BRW_SURFACEFORMAT_R16_UNORM, raw_sample | depth_format | desktop_gl_sel}, [MESA_FORMAT_X8_Z24] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM, - BRW_SURFACEFORMAT_I24X8_UNORM, + BRW_SURFACEFORMAT_R24_UNORM_X8_TYPELESS, raw_sample | depth_format}, [MESA_FORMAT_Z24_X8] = {BRW_SURFACEFORMAT_NONE, BRW_SURFACEFORMAT_NONE, @@ -866,10 +866,10 @@ brw_format_for_mesa_format(gl_format mesa_format) raw_sample}, [MESA_FORMAT_Z32_FLOAT] = {BRW_SURFACEFORMAT_R32_FLOAT, - BRW_SURFACEFORMAT_I32_FLOAT, + BRW_SURFACEFORMAT_R32_FLOAT, 0}, [MESA_FORMAT_Z32_FLOAT_X24S8] = {BRW_SURFACEFORMAT_R32G32_FLOAT, - BRW_SURFACEFORMAT_R32G32_FLOAT, + BRW_SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS, 0}, [MESA_FORMAT_ARGB2101010_UINT] = {BRW_SURFACEFORMAT_NONE, @@ -926,7 +926,7 @@ brw_format_for_mesa_format(gl_format mesa_format) sample_swizzle_all} }; - assert(mesa_format < MESA_PRIVATE_FORMAT_COUNT); + assert(mesa_format < MESA_GL_USER_FORMAT_COUNT); return &table[mesa_format]; } diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 9483a43b9d..f09a4a1551 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp @@ -273,7 +273,7 @@ gen6_blorp_emit_blend_state(struct brw_context *brw, blend->blend0.ia_source_blend_factor = BRW_BLENDFACTOR_ONE; blend->blend0.ia_dest_blend_factor = BRW_BLENDFACTOR_ZERO; - _mesa_debug(&brw->ctx, "%s forcing Alpha to 1.0", __FUNCTION__); + _mesa_debug(&brw->ctx, "%s forcing Alpha to 1.0\n", __FUNCTION__); } return cc_blend_state_offset; diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index f9db45116f..5e89d3c51a 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -168,25 +168,6 @@ intelTexImage(struct gl_context * ctx, GLenum format, GLenum type, const void *pixels, const struct gl_pixelstore_attrib *unpack) { - static unsigned gpuCount = 0; - static unsigned totalCount = 0; - static double time0 = 0.0; - - if (0 == totalCount) { - struct timespec timestruct; - clock_gettime(CLOCK_MONOTONIC, ×truct); - time0 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0; - } - - totalCount++; - - if (300 == totalCount) { - struct timespec timestruct; - clock_gettime(CLOCK_MONOTONIC, ×truct); - double time1 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0; -// _mesa_debug(ctx, "%s Load time for 300 textures: %g \n", __FUNCTION__, time1 - time0); - } - DBG("%s target %s level %d %dx%dx%d\n", __FUNCTION__, _mesa_lookup_enum_by_nr(texImage->TexObject->Target), texImage->Level, texImage->Width, texImage->Height, texImage->Depth); @@ -195,12 +176,6 @@ intelTexImage(struct gl_context * ctx, if (brw_blorp_GPUcopytexsubimage(brw_context(ctx), dims, texImage, format, type, pixels, unpack, 0, 0, 0, 0, 0, texImage->Width, texImage->Height)) { - - gpuCount++; - if (!(totalCount % 512)) { -// _mesa_debug(ctx, "%s used blorp load. ratio = %g \n", __FUNCTION__, (double)gpuCount / (double)totalCount); - } - return; } diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 9226ddc97f..607f3039e1 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -76,7 +76,7 @@ struct gl_format_info * These must be in the same order as the MESA_FORMAT_* enums so that * we can do lookups without searching. */ -static struct gl_format_info format_info[MESA_PRIVATE_FORMAT_COUNT] = +static struct gl_format_info format_info[MESA_GL_USER_FORMAT_COUNT] = { { MESA_FORMAT_NONE, /* Name */ @@ -1856,15 +1856,6 @@ static struct gl_format_info format_info[MESA_PRIVATE_FORMAT_COUNT] = }, /* Red Green Blue Alpha */ - { - MESA_FORMAT_RGBA1010102, - "MESA_FORMAT_RGBA1010102", - GL_RGBA, - GL_UNSIGNED_NORMALIZED, - 10, 10, 10, 2, - 0, 0, 0, 0, 0, - 1, 1, 4 - }, { MESA_FORMAT_RGBA4444, /* Name */ "MESA_FORMAT_RGBA4444", /* StrName */ @@ -2479,7 +2470,7 @@ _mesa_test_formats(void) { GLuint i; - STATIC_ASSERT(Elements(format_info) == MESA_PRIVATE_FORMAT_COUNT); + STATIC_ASSERT(Elements(format_info) == MESA_GL_USER_FORMAT_COUNT); for (i = 0; i < MESA_FORMAT_COUNT; i++) { const struct gl_format_info *info = _mesa_get_format_info(i); diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h index d2ff643ed9..f28b72e388 100644 --- a/src/mesa/main/formats.h +++ b/src/mesa/main/formats.h @@ -326,7 +326,6 @@ typedef enum MESA_FORMAT_BGR332, /* Red Green Blue Alpha */ - MESA_FORMAT_RGBA1010102, MESA_FORMAT_RGBA4444, MESA_FORMAT_RGBA4444_REV, @@ -345,7 +344,7 @@ typedef enum MESA_FORMAT_BGRA5551, MESA_FORMAT_BGRA1010102, - MESA_PRIVATE_FORMAT_COUNT + MESA_GL_USER_FORMAT_COUNT } gl_format; diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index 7f7189b039..5e977c04a4 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -834,7 +834,7 @@ _mesa_tex_target_is_array(GLenum target) /** * Choose a texture format that exactly matches the application texture - * given the format, and type Format parameters passed to glTexImage(). + * given the format, and type parameters passed to glTexImage(). * * \param ctx the GL context. * \param format incoming image pixel format. @@ -851,15 +851,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_RED_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_R_INT8; + return MESA_FORMAT_R_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_R_UINT8; case GL_SHORT: - return MESA_FORMAT_R_INT16; + return MESA_FORMAT_R_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_R_UINT16; case GL_INT: - return MESA_FORMAT_R_INT32; + return MESA_FORMAT_R_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_R_UINT32; case GL_FLOAT: @@ -873,15 +873,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_RG_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_RG_INT8; + return MESA_FORMAT_RG_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_RG_UINT8; case GL_SHORT: - return MESA_FORMAT_RG_INT16; + return MESA_FORMAT_RG_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_RG_UINT16; case GL_INT: - return MESA_FORMAT_RG_INT32; + return MESA_FORMAT_RG_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_RG_UINT32; case GL_FLOAT: @@ -895,15 +895,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_RGB_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_RGB_INT8; + return MESA_FORMAT_RGB_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_RGB_UINT8; case GL_SHORT: - return MESA_FORMAT_RGB_INT16; + return MESA_FORMAT_RGB_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_RGB_UINT16; case GL_INT: - return MESA_FORMAT_RGB_INT32; + return MESA_FORMAT_RGB_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_RGB_UINT32; case GL_FLOAT: @@ -927,16 +927,16 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_BGR_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_BGR_INT8; + return MESA_FORMAT_BGR_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_BGR_UINT8; case GL_SHORT: - return MESA_FORMAT_BGR_INT16; + return MESA_FORMAT_BGR_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_BGR_UINT16; case GL_INT: - return MESA_FORMAT_BGR_INT32; - case GL_UNSIGNED_INT: + return MESA_FORMAT_BGR_SINT32; + case GL_UNSIGNED_SINT: return MESA_FORMAT_BGR_UINT32; case GL_FLOAT: return MESA_FORMAT_BGR_FLOAT32; @@ -949,15 +949,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_RGBA_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_RGBA_INT8; + return MESA_FORMAT_RGBA_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_RGBA_UINT8; case GL_SHORT: - return MESA_FORMAT_RGBA_INT16; + return MESA_FORMAT_RGBA_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_RGBA_UINT16; case GL_INT: - return MESA_FORMAT_RGBA_INT32; + return MESA_FORMAT_RGBA_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_RGBA_UINT32; case GL_FLOAT: @@ -983,15 +983,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_BGRA_INTEGER: switch (type) { case GL_BYTE: - return MESA_FORMAT_BGRA_INT8; + return MESA_FORMAT_BGRA_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_BGRA_UINT8; case GL_SHORT: - return MESA_FORMAT_BGRA_INT16; + return MESA_FORMAT_BGRA_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_BGRA_UINT16; case GL_INT: - return MESA_FORMAT_BGRA_INT32; + return MESA_FORMAT_BGRA_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_BGRA_UINT32; case GL_FLOAT: @@ -1005,9 +1005,9 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_UNSIGNED_SHORT_5_5_5_1: return MESA_FORMAT_BGRA5551; case GL_UNSIGNED_INT_8_8_8_8: - return MESA_FORMAT_BGRA_INT8; + return MESA_FORMAT_BGRA_SINT8; case GL_UNSIGNED_INT_8_8_8_8_REV: - return MESA_FORMAT_BGRA_INT8_REV; + return MESA_FORMAT_BGRA_SINT8_REV; case GL_UNSIGNED_INT_10_10_10_2: return MESA_FORMAT_BGRA1010102; } @@ -1022,15 +1022,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_LUMINANCE: switch (type) { case GL_BYTE: - return MESA_FORMAT_LUMINANCE_INT8; + return MESA_FORMAT_LUMINANCE_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_LUMINANCE_UINT8; case GL_SHORT: - return MESA_FORMAT_LUMINANCE_INT16; + return MESA_FORMAT_LUMINANCE_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_LUMINANCE_UINT16; case GL_INT: - return MESA_FORMAT_LUMINANCE_INT32; + return MESA_FORMAT_LUMINANCE_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_LUMINANCE_UINT32; case GL_FLOAT: @@ -1043,15 +1043,15 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_LUMINANCE_ALPHA: switch (type) { case GL_BYTE: - return MESA_FORMAT_LUMINANCE_ALPHA_INT8; + return MESA_FORMAT_LUMINANCE_ALPHA_SINT8; case GL_UNSIGNED_BYTE: return MESA_FORMAT_LUMINANCE_ALPHA_UINT8; case GL_SHORT: - return MESA_FORMAT_LUMINANCE_ALPHA_INT16; + return MESA_FORMAT_LUMINANCE_ALPHA_SINT16; case GL_UNSIGNED_SHORT: return MESA_FORMAT_LUMINANCE_ALPHA_UINT16; case GL_INT: - return MESA_FORMAT_LUMINANCE_ALPHA_INT32; + return MESA_FORMAT_LUMINANCE_ALPHA_SINT32; case GL_UNSIGNED_INT: return MESA_FORMAT_LUMINANCE_ALPHA_UINT32; case GL_FLOAT: @@ -1063,7 +1063,7 @@ _mesa_choose_cached_tex_format(struct gl_context *ctx, GLenum format, GLenum typ case GL_DEPTH_COMPONENT: switch (type) { - case GL_INT: + case GL_SINT: return MESA_FORMAT_Z32; case GL_UNSIGNED_INT: return MESA_FORMAT_Z32; -- cgit v1.2.3