* Max texture sizes
* XXX Check max texture size values against core and sampler.
*/
-#define SWR_MAX_TEXTURE_SIZE (4 * 1024 * 1024 * 1024ULL) /* 4GB */
+#define SWR_MAX_TEXTURE_SIZE (2 * 1024 * 1024 * 1024ULL) /* 2GB */
#define SWR_MAX_TEXTURE_2D_LEVELS 14 /* 8K x 8K for now */
#define SWR_MAX_TEXTURE_3D_LEVELS 12 /* 2K x 2K x 2K for now */
#define SWR_MAX_TEXTURE_CUBE_LEVELS 14 /* 8K x 8K for now */
#define SWR_MAX_TEXTURE_ARRAY_LAYERS 512 /* 8K x 512 / 8K x 8K x 512 */
/* Default max client_copy_limit */
-#define SWR_CLIENT_COPY_LIMIT 32768
+#define SWR_CLIENT_COPY_LIMIT 8192
/* Flag indicates creation of alternate surface, to prevent recursive loop
* in resource creation when msaa_force_enable is set. */
return FALSE;
}
- if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
- return util_format_s3tc_enabled;
- }
-
return TRUE;
}
case PIPE_CAP_NPOT_TEXTURES:
case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
case PIPE_CAP_MIXED_COLOR_DEPTH_BITS:
- case PIPE_CAP_TWO_SIDED_STENCIL:
case PIPE_CAP_SM3:
case PIPE_CAP_POINT_SPRITE:
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
case PIPE_CAP_QUERY_TIME_ELAPSED:
case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
- case PIPE_CAP_TEXTURE_SHADOW_MAP:
case PIPE_CAP_TEXTURE_SWIZZLE:
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
case PIPE_CAP_INDEP_BLEND_ENABLE:
case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
case PIPE_CAP_USER_VERTEX_BUFFERS:
- case PIPE_CAP_USER_CONSTANT_BUFFERS:
case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
case PIPE_CAP_QUERY_TIMESTAMP:
case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
case PIPE_CAP_QUERY_SO_OVERFLOW:
case PIPE_CAP_MEMOBJ:
case PIPE_CAP_LOAD_CONSTBUF:
+ case PIPE_CAP_TGSI_ANY_REG_AS_ADDRESS:
+ case PIPE_CAP_TILE_RASTER_ORDER:
+ case PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES:
+ case PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET:
+ case PIPE_CAP_CONTEXT_PRIORITY_MASK:
+ case PIPE_CAP_FENCE_SIGNAL:
+ case PIPE_CAP_CONSTBUF0_FLAGS:
+ case PIPE_CAP_PACKED_UNIFORMS:
return 0;
case PIPE_CAP_VENDOR_ID:
return 0.0;
case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
return 16.0; /* arbitrary */
- case PIPE_CAPF_GUARD_BAND_LEFT:
- case PIPE_CAPF_GUARD_BAND_TOP:
- case PIPE_CAPF_GUARD_BAND_RIGHT:
- case PIPE_CAPF_GUARD_BAND_BOTTOM:
- return 0.0;
}
/* should only get here on unhandled cases */
debug_printf("Unexpected PIPE_CAPF %d query\n", param);
ComputeSurfaceOffset<false>(0, 0, 0, 0, 0, level, &res->swr);
}
- size_t total_size = res->swr.depth * res->swr.qpitch * res->swr.pitch *
- res->swr.numSamples;
+ size_t total_size = (uint64_t)res->swr.depth * res->swr.qpitch *
+ res->swr.pitch * res->swr.numSamples;
if (total_size > SWR_MAX_TEXTURE_SIZE)
return false;
if (allocate) {
res->swr.xpBaseAddress = (gfxptr_t)AlignedMalloc(total_size, 64);
+ if (!res->swr.xpBaseAddress)
+ return false;
if (res->has_depth && res->has_stencil) {
res->secondary = res->swr;
res->secondary.pitch * res->secondary.numSamples;
res->secondary.xpBaseAddress = (gfxptr_t) AlignedMalloc(total_size, 64);
+ if (!res->secondary.xpBaseAddress) {
+ AlignedFree((void *)res->swr.xpBaseAddress);
+ return false;
+ }
}
}
}
+void
+swr_destroy_screen_internal(struct swr_screen **screen)
+{
+ struct pipe_screen *p_screen = &(*screen)->base;
+
+ swr_fence_finish(p_screen, NULL, (*screen)->flush_fence, 0);
+ swr_fence_reference(p_screen, &(*screen)->flush_fence, NULL);
+
+ JitDestroyContext((*screen)->hJitMgr);
+
+ if ((*screen)->pLibrary)
+ util_dl_close((*screen)->pLibrary);
+
+ FREE(*screen);
+ *screen = NULL;
+}
+
+
static void
swr_destroy_screen(struct pipe_screen *p_screen)
{
fprintf(stderr, "SWR destroy screen!\n");
- swr_fence_finish(p_screen, NULL, screen->flush_fence, 0);
- swr_fence_reference(p_screen, &screen->flush_fence, NULL);
-
- JitDestroyContext(screen->hJitMgr);
-
if (winsys->destroy)
winsys->destroy(winsys);
- FREE(screen);
+ swr_destroy_screen_internal(&screen);
}
swr_create_screen_internal(struct sw_winsys *winsys)
{
struct swr_screen *screen = CALLOC_STRUCT(swr_screen);
+ memset(screen, 0, sizeof(struct swr_screen));
if (!screen)
return NULL;
swr_fence_init(&screen->base);
- util_format_s3tc_init();
-
swr_validate_env_options(screen);
return &screen->base;