#include "main/hash.h"
#include "main/fbobject.h"
#include "main/mfeatures.h"
+#include "main/version.h"
+#include "swrast/s_renderbuffer.h"
#include "utils.h"
#include "xmlpool.h"
DRI_CONF_OPT_BEGIN(stub_occlusion_query, bool, false)
DRI_CONF_DESC(en, "Enable stub ARB_occlusion_query support on 915/945.")
DRI_CONF_OPT_END
+
+ DRI_CONF_OPT_BEGIN(shader_precompile, bool, false)
+ DRI_CONF_DESC(en, "Perform code generation at shader link time.")
+ DRI_CONF_OPT_END
DRI_CONF_SECTION_END
DRI_CONF_END;
-const GLuint __driNConfigOptions = 11;
+const GLuint __driNConfigOptions = 12;
#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "intel_bufmgr.h"
#include "intel_chipset.h"
#include "intel_fbo.h"
+#include "intel_mipmap_tree.h"
#include "intel_screen.h"
#include "intel_tex.h"
#include "intel_regions.h"
if (intel->gen < 4)
INTEL_FIREVERTICES(intel);
- intel->need_throttle = GL_TRUE;
+ intel->need_throttle = true;
if (intel->batch.used)
intel_batchbuffer_flush(intel);
int width, int height, int format,
int name, int pitch, void *loaderPrivate)
{
- struct intel_screen *intelScreen = screen->private;
+ struct intel_screen *intelScreen = screen->driverPrivate;
__DRIimage *image;
int cpp;
image->internal_format = GL_RGBA;
image->data_type = GL_UNSIGNED_BYTE;
break;
+ case __DRI_IMAGE_FORMAT_ABGR8888:
+ image->format = MESA_FORMAT_RGBA8888_REV;
+ image->internal_format = GL_RGBA;
+ image->data_type = GL_UNSIGNED_BYTE;
+ break;
default:
free(image);
return NULL;
image->format = rb->Format;
image->data_type = rb->DataType;
image->data = loaderPrivate;
- intel_region_reference(&image->region, irb->region);
+ intel_region_reference(&image->region, irb->mt->region);
return image;
}
void *loaderPrivate)
{
__DRIimage *image;
- struct intel_screen *intelScreen = screen->private;
+ struct intel_screen *intelScreen = screen->driverPrivate;
uint32_t tiling;
int cpp;
image->internal_format = GL_RGBA;
image->data_type = GL_UNSIGNED_BYTE;
break;
+ case __DRI_IMAGE_FORMAT_ABGR8888:
+ image->format = MESA_FORMAT_RGBA8888_REV;
+ image->internal_format = GL_RGBA;
+ image->data_type = GL_UNSIGNED_BYTE;
+ break;
default:
free(image);
return NULL;
image->region =
intel_region_alloc(intelScreen, tiling,
- cpp, width, height, GL_TRUE);
+ cpp, width, height, true);
if (image->region == NULL) {
FREE(image);
return NULL;
switch (attrib) {
case __DRI_IMAGE_ATTRIB_STRIDE:
*value = image->region->pitch * image->region->cpp;
- return GL_TRUE;
+ return true;
case __DRI_IMAGE_ATTRIB_HANDLE:
- *value = image->region->buffer->handle;
- return GL_TRUE;
+ *value = image->region->bo->handle;
+ return true;
case __DRI_IMAGE_ATTRIB_NAME:
return intel_region_flink(image->region, (uint32_t *) value);
default:
- return GL_FALSE;
+ return false;
+ }
+}
+
+static __DRIimage *
+intel_dup_image(__DRIimage *orig_image, void *loaderPrivate)
+{
+ __DRIimage *image;
+
+ image = CALLOC(sizeof *image);
+ if (image == NULL)
+ return NULL;
+
+ intel_region_reference(&image->region, orig_image->region);
+ if (image->region == NULL) {
+ FREE(image);
+ return NULL;
}
+
+ image->internal_format = orig_image->internal_format;
+ image->format = orig_image->format;
+ image->data_type = orig_image->data_type;
+ image->data = loaderPrivate;
+
+ return image;
}
static struct __DRIimageExtensionRec intelImageExtension = {
intel_create_image_from_renderbuffer,
intel_destroy_image,
intel_create_image,
- intel_query_image
+ intel_query_image,
+ intel_dup_image
};
static const __DRIextension *intelScreenExtensions[] = {
- &driReadDrawableExtension,
&intelTexBufferExtension.base,
&intelFlushExtension.base,
&intelImageExtension.base,
NULL
};
-static GLboolean
+static bool
intel_get_param(__DRIscreen *psp, int param, int *value)
{
int ret;
if (ret) {
if (ret != -EINVAL)
_mesa_warning(NULL, "drm_i915_getparam: %d", ret);
- return GL_FALSE;
+ return false;
}
- return GL_TRUE;
+ return true;
}
-static GLboolean
+static bool
intel_get_boolean(__DRIscreen *psp, int param)
{
int value = 0;
static void
intelDestroyScreen(__DRIscreen * sPriv)
{
- struct intel_screen *intelScreen = sPriv->private;
+ struct intel_screen *intelScreen = sPriv->driverPrivate;
dri_bufmgr_destroy(intelScreen->bufmgr);
driDestroyOptionInfo(&intelScreen->optionCache);
_mesa_DeleteHashTable(intelScreen->named_regions);
FREE(intelScreen);
- sPriv->private = NULL;
+ sPriv->driverPrivate = NULL;
}
const struct gl_config * mesaVis, GLboolean isPixmap)
{
struct intel_renderbuffer *rb;
+ struct intel_screen *screen = (struct intel_screen*) driScrnPriv->driverPrivate;
if (isPixmap) {
- return GL_FALSE; /* not implemented */
+ return false; /* not implemented */
}
else {
- GLboolean swStencil = (mesaVis->stencilBits > 0 &&
- mesaVis->depthBits != 24);
gl_format rgbFormat;
struct gl_framebuffer *fb = CALLOC_STRUCT(gl_framebuffer);
if (!fb)
- return GL_FALSE;
+ return false;
_mesa_initialize_window_framebuffer(fb, mesaVis);
_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &rb->Base);
}
+ /*
+ * Assert here that the gl_config has an expected depth/stencil bit
+ * combination: one of d24/s8, d16/s0, d0/s0. (See intelInitScreen2(),
+ * which constructs the advertised configs.)
+ */
if (mesaVis->depthBits == 24) {
assert(mesaVis->stencilBits == 8);
- /* combined depth/stencil buffer */
- struct intel_renderbuffer *depthStencilRb
- = intel_create_renderbuffer(MESA_FORMAT_S8_Z24);
- /* note: bind RB to two attachment points */
- _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthStencilRb->Base);
- _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &depthStencilRb->Base);
+
+ if (screen->hw_has_separate_stencil
+ && screen->dri2_has_hiz != INTEL_DRI2_HAS_HIZ_FALSE) {
+ /*
+ * Request a separate stencil buffer even if we do not yet know if
+ * the screen supports it. (See comments for
+ * enum intel_dri2_has_hiz).
+ */
+ rb = intel_create_renderbuffer(MESA_FORMAT_X8_Z24);
+ _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &rb->Base);
+ rb = intel_create_renderbuffer(MESA_FORMAT_S8);
+ _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &rb->Base);
+ } else {
+ /*
+ * Use combined depth/stencil. Note that the renderbuffer is
+ * attached to two attachment points.
+ */
+ rb = intel_create_renderbuffer(MESA_FORMAT_S8_Z24);
+ _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &rb->Base);
+ _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &rb->Base);
+ }
}
else if (mesaVis->depthBits == 16) {
+ assert(mesaVis->stencilBits == 0);
/* just 16-bit depth buffer, no hw stencil */
struct intel_renderbuffer *depthRb
= intel_create_renderbuffer(MESA_FORMAT_Z16);
_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
}
+ else {
+ assert(mesaVis->depthBits == 0);
+ assert(mesaVis->stencilBits == 0);
+ }
/* now add any/all software-based renderbuffers we may need */
- _mesa_add_soft_renderbuffers(fb,
- GL_FALSE, /* never sw color */
- GL_FALSE, /* never sw depth */
- swStencil, mesaVis->accumRedBits > 0,
- GL_FALSE, /* never sw alpha */
- GL_FALSE /* never sw aux */ );
+ _swrast_add_soft_renderbuffers(fb,
+ false, /* never sw color */
+ false, /* never sw depth */
+ false, /* never sw stencil */
+ mesaVis->accumRedBits > 0,
+ false, /* never sw alpha */
+ false /* never sw aux */ );
driDrawPriv->driverPrivate = fb;
- return GL_TRUE;
+ return true;
}
}
* init-designated function to register chipids and createcontext
* functions.
*/
-extern GLboolean i830CreateContext(const struct gl_config * mesaVis,
- __DRIcontext * driContextPriv,
- void *sharedContextPrivate);
-
-extern GLboolean i915CreateContext(int api,
- const struct gl_config * mesaVis,
- __DRIcontext * driContextPriv,
- void *sharedContextPrivate);
-extern GLboolean brwCreateContext(int api,
- const struct gl_config * mesaVis,
- __DRIcontext * driContextPriv,
- void *sharedContextPrivate);
+extern bool
+i830CreateContext(const struct gl_config *mesaVis,
+ __DRIcontext *driContextPriv,
+ void *sharedContextPrivate);
+
+extern bool
+i915CreateContext(int api,
+ const struct gl_config *mesaVis,
+ __DRIcontext *driContextPriv,
+ void *sharedContextPrivate);
+extern bool
+brwCreateContext(int api,
+ const struct gl_config *mesaVis,
+ __DRIcontext *driContextPriv,
+ void *sharedContextPrivate);
static GLboolean
intelCreateContext(gl_api api,
const struct gl_config * mesaVis,
__DRIcontext * driContextPriv,
+ unsigned major_version,
+ unsigned minor_version,
+ uint32_t flags,
+ unsigned *error,
void *sharedContextPrivate)
{
__DRIscreen *sPriv = driContextPriv->driScreenPriv;
- struct intel_screen *intelScreen = sPriv->private;
+ struct intel_screen *intelScreen = sPriv->driverPrivate;
+ bool success;
#ifdef I915
if (IS_9XX(intelScreen->deviceID)) {
if (!IS_965(intelScreen->deviceID)) {
- return i915CreateContext(api, mesaVis, driContextPriv,
- sharedContextPrivate);
+ success = i915CreateContext(api, mesaVis, driContextPriv,
+ sharedContextPrivate);
}
} else {
- intelScreen->no_vbo = GL_TRUE;
- return i830CreateContext(mesaVis, driContextPriv, sharedContextPrivate);
+ intelScreen->no_vbo = true;
+ success = i830CreateContext(mesaVis, driContextPriv,
+ sharedContextPrivate);
}
#else
if (IS_965(intelScreen->deviceID))
- return brwCreateContext(api, mesaVis,
- driContextPriv, sharedContextPrivate);
+ success = brwCreateContext(api, mesaVis,
+ driContextPriv,
+ sharedContextPrivate);
#endif
- fprintf(stderr, "Unrecognized deviceID 0x%x\n", intelScreen->deviceID);
- return GL_FALSE;
+
+ if (success) {
+ struct gl_context *ctx =
+ (struct gl_context *) driContextPriv->driverPrivate;
+
+ _mesa_compute_version(ctx);
+ if (ctx->VersionMajor > major_version
+ || (ctx->VersionMajor == major_version
+ && ctx->VersionMinor >= minor_version)) {
+ *error = __DRI_CTX_ERROR_BAD_VERSION;
+ return true;
+ }
+
+ intelDestroyContext(driContextPriv);
+ } else {
+ *error = __DRI_CTX_ERROR_NO_MEMORY;
+ fprintf(stderr, "Unrecognized deviceID 0x%x\n", intelScreen->deviceID);
+ }
+
+ return false;
}
-static GLboolean
+static bool
intel_init_bufmgr(struct intel_screen *intelScreen)
{
__DRIscreen *spriv = intelScreen->driScrnPriv;
if (intelScreen->bufmgr == NULL) {
fprintf(stderr, "[%s:%u] Error initializing buffer manager.\n",
__func__, __LINE__);
- return GL_FALSE;
+ return false;
}
if (!intel_get_param(spriv, I915_PARAM_NUM_FENCES_AVAIL, &num_fences) ||
num_fences == 0) {
fprintf(stderr, "[%s: %u] Kernel 2.6.29 required.\n", __func__, __LINE__);
- return GL_FALSE;
+ return false;
}
drm_intel_bufmgr_gem_enable_fenced_relocs(intelScreen->bufmgr);
intelScreen->relaxed_relocations |=
intel_get_boolean(spriv, I915_PARAM_HAS_RELAXED_DELTA) << 0;
- return GL_TRUE;
+ return true;
+}
+
+/**
+ * Override intel_screen.hw_has_hiz with environment variable INTEL_HIZ.
+ *
+ * Valid values for INTEL_HIZ are "0" and "1". If an invalid valid value is
+ * encountered, a warning is emitted and INTEL_HIZ is ignored.
+ */
+static void
+intel_override_hiz(struct intel_screen *intel)
+{
+ const char *s = getenv("INTEL_HIZ");
+ if (!s) {
+ return;
+ } else if (!strncmp("0", s, 2)) {
+ intel->hw_has_hiz = false;
+ } else if (!strncmp("1", s, 2)) {
+ intel->hw_has_hiz = true;
+ } else {
+ fprintf(stderr,
+ "warning: env variable INTEL_HIZ=\"%s\" has invalid value "
+ "and is ignored", s);
+ }
+}
+
+/**
+ * Override intel_screen.hw_has_separate_stencil with environment variable
+ * INTEL_SEPARATE_STENCIL.
+ *
+ * Valid values for INTEL_SEPARATE_STENCIL are "0" and "1". If an invalid
+ * valid value is encountered, a warning is emitted and INTEL_SEPARATE_STENCIL
+ * is ignored.
+ */
+static void
+intel_override_separate_stencil(struct intel_screen *screen)
+{
+ const char *s = getenv("INTEL_SEPARATE_STENCIL");
+ if (!s) {
+ return;
+ } else if (!strncmp("0", s, 2)) {
+ screen->hw_has_separate_stencil = false;
+ } else if (!strncmp("1", s, 2)) {
+ screen->hw_has_separate_stencil = true;
+ } else {
+ fprintf(stderr,
+ "warning: env variable INTEL_SEPARATE_STENCIL=\"%s\" has "
+ "invalid value and is ignored", s);
+ }
}
/**
intelScreen = CALLOC(sizeof *intelScreen);
if (!intelScreen) {
fprintf(stderr, "\nERROR! Allocating private area failed\n");
- return GL_FALSE;
+ return false;
}
/* parse information in __driConfigOptions */
driParseOptionInfo(&intelScreen->optionCache,
__driConfigOptions, __driNConfigOptions);
intelScreen->driScrnPriv = psp;
- psp->private = (void *) intelScreen;
+ psp->driverPrivate = (void *) intelScreen;
/* Determine chipset ID */
if (!intel_get_param(psp, I915_PARAM_CHIPSET_ID,
&intelScreen->deviceID))
- return GL_FALSE;
+ return false;
/* Allow an override of the device ID for the purpose of making the
* driver produce dumps for debugging of new chipset enablement.
intelScreen->deviceID = strtod(devid_override, NULL);
}
+ intelScreen->kernel_has_gen7_sol_reset =
+ intel_get_boolean(intelScreen->driScrnPriv,
+ I915_PARAM_HAS_GEN7_SOL_RESET);
+
if (IS_GEN7(intelScreen->deviceID)) {
intelScreen->gen = 7;
} else if (IS_GEN6(intelScreen->deviceID)) {
intelScreen->gen = 2;
}
+ intelScreen->hw_has_separate_stencil = intelScreen->gen >= 6;
+ intelScreen->hw_must_use_separate_stencil = intelScreen->gen >= 7;
+ intelScreen->hw_has_hiz = intelScreen->gen >= 6;
+ intelScreen->dri2_has_hiz = INTEL_DRI2_HAS_HIZ_UNKNOWN;
+
+ intel_override_hiz(intelScreen);
+ intel_override_separate_stencil(intelScreen);
+
api_mask = (1 << __DRI_API_OPENGL);
#if FEATURE_ES1
api_mask |= (1 << __DRI_API_GLES);
psp->api_mask = api_mask;
if (!intel_init_bufmgr(intelScreen))
- return GL_FALSE;
+ return false;
psp->extensions = intelScreenExtensions;
ARRAY_SIZE(back_buffer_modes),
msaa_samples_array,
ARRAY_SIZE(msaa_samples_array),
- GL_FALSE);
+ false);
if (configs == NULL)
configs = new_configs;
else
depth_bits, stencil_bits, 1,
back_buffer_modes + 1, 1,
msaa_samples_array, 1,
- GL_TRUE);
+ true);
if (configs == NULL)
configs = new_configs;
else
struct intel_region *region;
};
+/**
+ * \brief Get tiling format for a DRI buffer.
+ *
+ * \param attachment is the buffer's attachmet point, such as
+ * __DRI_BUFFER_DEPTH.
+ * \param out_tiling is the returned tiling format for buffer.
+ * \return false if attachment is unrecognized or is incompatible with screen.
+ */
+static bool
+intel_get_dri_buffer_tiling(struct intel_screen *screen,
+ uint32_t attachment,
+ uint32_t *out_tiling)
+{
+ if (screen->gen < 4) {
+ *out_tiling = I915_TILING_X;
+ return true;
+ }
+
+ switch (attachment) {
+ case __DRI_BUFFER_DEPTH:
+ case __DRI_BUFFER_DEPTH_STENCIL:
+ case __DRI_BUFFER_HIZ:
+ *out_tiling = I915_TILING_Y;
+ return true;
+ case __DRI_BUFFER_ACCUM:
+ case __DRI_BUFFER_FRONT_LEFT:
+ case __DRI_BUFFER_FRONT_RIGHT:
+ case __DRI_BUFFER_BACK_LEFT:
+ case __DRI_BUFFER_BACK_RIGHT:
+ case __DRI_BUFFER_FAKE_FRONT_LEFT:
+ case __DRI_BUFFER_FAKE_FRONT_RIGHT:
+ *out_tiling = I915_TILING_X;
+ return true;
+ case __DRI_BUFFER_STENCIL:
+ /* The stencil buffer is W tiled. However, we request from the kernel
+ * a non-tiled buffer because the GTT is incapable of W fencing.
+ */
+ *out_tiling = I915_TILING_NONE;
+ return true;
+ default:
+ if(unlikely(INTEL_DEBUG & DEBUG_DRI)) {
+ fprintf(stderr, "error: %s: unrecognized DRI buffer attachment 0x%x\n",
+ __FUNCTION__, attachment);
+ }
+ return false;
+ }
+}
+
static __DRIbuffer *
intelAllocateBuffer(__DRIscreen *screen,
unsigned attachment, unsigned format,
int width, int height)
{
struct intel_buffer *intelBuffer;
- struct intel_screen *intelScreen = screen->private;
+ struct intel_screen *intelScreen = screen->driverPrivate;
+
uint32_t tiling;
+ uint32_t region_width;
+ uint32_t region_height;
+ uint32_t region_cpp;
+
+ bool ok = true;
+
+ ok = intel_get_dri_buffer_tiling(intelScreen, attachment, &tiling);
+ if (!ok)
+ return NULL;
intelBuffer = CALLOC(sizeof *intelBuffer);
if (intelBuffer == NULL)
return NULL;
- if ((attachment == __DRI_BUFFER_DEPTH ||
- attachment == __DRI_BUFFER_STENCIL ||
- attachment == __DRI_BUFFER_DEPTH_STENCIL) &&
- intelScreen->gen >= 4)
- tiling = I915_TILING_Y;
- else
- tiling = I915_TILING_X;
+ if (attachment == __DRI_BUFFER_STENCIL) {
+ /* The stencil buffer has quirky pitch requirements. From Vol 2a,
+ * 11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
+ * The pitch must be set to 2x the value computed based on width, as
+ * the stencil buffer is stored with two rows interleaved.
+ * To accomplish this, we resort to the nasty hack of doubling the
+ * region's cpp and halving its height.
+ */
+ region_width = ALIGN(width, 64);
+ region_height = ALIGN(ALIGN(height, 2) / 2, 64);
+ region_cpp = format / 4;
+ } else {
+ region_width = width;
+ region_height = height;
+ region_cpp = format / 8;
+ }
- intelBuffer->region = intel_region_alloc(intelScreen, tiling,
- format / 8, width, height, GL_TRUE);
+ intelBuffer->region = intel_region_alloc(intelScreen,
+ tiling,
+ region_cpp,
+ region_width,
+ region_height,
+ true);
if (intelBuffer->region == NULL) {
FREE(intelBuffer);
const struct __DriverAPIRec driDriverAPI = {
+ .InitScreen = intelInitScreen2,
.DestroyScreen = intelDestroyScreen,
.CreateContext = intelCreateContext,
.DestroyContext = intelDestroyContext,
.DestroyBuffer = intelDestroyBuffer,
.MakeCurrent = intelMakeCurrent,
.UnbindContext = intelUnbindContext,
- .InitScreen2 = intelInitScreen2,
.AllocateBuffer = intelAllocateBuffer,
.ReleaseBuffer = intelReleaseBuffer
};
projects / mesa.git / blobdiff