static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
{
- const struct intel_context *const intel = intel_context(ctx);
+ const struct brw_context *const brw = brw_context(ctx);
const char *chipset;
static char buffer[128];
break;
case GL_RENDERER:
- switch (intel->intelScreen->deviceID) {
+ switch (brw->intelScreen->deviceID) {
#undef CHIPSET
#define CHIPSET(id, symbol, str) case id: chipset = str; break;
#include "pci_ids/i965_pci_ids.h"
intel_resolve_for_dri2_flush(struct brw_context *brw,
__DRIdrawable *drawable)
{
- struct intel_context *intel = &brw->intel;
- if (intel->gen < 6) {
+ if (brw->gen < 6) {
/* MSAA and fast color clear are not supported, so don't waste time
* checking whether a resolve is needed.
*/
intel_flush_front(struct gl_context *ctx)
{
struct brw_context *brw = brw_context(ctx);
- struct intel_context *intel = intel_context(ctx);
- __DRIcontext *driContext = intel->driContext;
+ __DRIcontext *driContext = brw->driContext;
__DRIdrawable *driDrawable = driContext->driDrawablePriv;
- __DRIscreen *const screen = intel->intelScreen->driScrnPriv;
+ __DRIscreen *const screen = brw->intelScreen->driScrnPriv;
if (brw->front_buffer_dirty && _mesa_is_winsys_fbo(ctx->DrawBuffer)) {
if (screen->dri2.loader->flushFrontBuffer != NULL &&
* performance.
*/
intel_resolve_for_dri2_flush(brw, driDrawable);
+ intel_batchbuffer_flush(brw);
screen->dri2.loader->flushFrontBuffer(driDrawable,
driDrawable->loaderPrivate);
struct gl_framebuffer *fb = drawable->driverPrivate;
struct intel_renderbuffer *rb;
struct brw_context *brw = context->driverPrivate;
- struct intel_context *intel = &brw->intel;
__DRIbuffer *buffers = NULL;
int i, count;
const char *region_name;
intel_process_dri2_buffer(brw, drawable, &buffers[i], rb, region_name);
}
- driUpdateFramebufferSize(&intel->ctx, drawable);
+ driUpdateFramebufferSize(&brw->ctx, drawable);
}
/**
void
intel_prepare_render(struct brw_context *brw)
{
- struct intel_context *intel = &brw->intel;
- __DRIcontext *driContext = intel->driContext;
+ __DRIcontext *driContext = brw->driContext;
__DRIdrawable *drawable;
drawable = driContext->driDrawablePriv;
* the swap, and getting our hands on that doesn't seem worth it,
* so we just us the first batch we emitted after the last swap.
*/
- if (intel->need_throttle && intel->first_post_swapbuffers_batch) {
- if (!intel->disable_throttling)
- drm_intel_bo_wait_rendering(intel->first_post_swapbuffers_batch);
- drm_intel_bo_unreference(intel->first_post_swapbuffers_batch);
- intel->first_post_swapbuffers_batch = NULL;
- intel->need_throttle = false;
+ if (brw->need_throttle && brw->first_post_swapbuffers_batch) {
+ if (!brw->disable_throttling)
+ drm_intel_bo_wait_rendering(brw->first_post_swapbuffers_batch);
+ drm_intel_bo_unreference(brw->first_post_swapbuffers_batch);
+ brw->first_post_swapbuffers_batch = NULL;
+ brw->need_throttle = false;
}
}
+static void
+intel_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+{
+ struct brw_context *brw = brw_context(ctx);
+ __DRIcontext *driContext = brw->driContext;
+
+ if (brw->saved_viewport)
+ brw->saved_viewport(ctx, x, y, w, h);
+
+ if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
+ dri2InvalidateDrawable(driContext->driDrawablePriv);
+ dri2InvalidateDrawable(driContext->driReadablePriv);
+ }
+}
+
static const struct dri_debug_control debug_control[] = {
{ "tex", DEBUG_TEXTURE},
{ "state", DEBUG_STATE},
{ "shader_time", DEBUG_SHADER_TIME },
{ "no16", DEBUG_NO16 },
{ "blorp", DEBUG_BLORP },
+ { "vue", DEBUG_VUE },
{ NULL, 0 }
};
static void
intelInvalidateState(struct gl_context * ctx, GLuint new_state)
{
- struct intel_context *intel = intel_context(ctx);
+ struct brw_context *brw = brw_context(ctx);
if (ctx->swrast_context)
_swrast_InvalidateState(ctx, new_state);
_vbo_InvalidateState(ctx, new_state);
- intel->NewGLState |= new_state;
-}
-
-void
-_intel_flush(struct gl_context *ctx, const char *file, int line)
-{
- struct brw_context *brw = brw_context(ctx);
- struct intel_context *intel = intel_context(ctx);
-
- if (intel->batch.used)
- _intel_batchbuffer_flush(brw, file, line);
+ brw->NewGLState |= new_state;
}
static void
intel_glFlush(struct gl_context *ctx)
{
struct brw_context *brw = brw_context(ctx);
- struct intel_context *intel = intel_context(ctx);
- intel_flush(ctx);
+ intel_batchbuffer_flush(brw);
intel_flush_front(ctx);
if (brw->is_front_buffer_rendering)
- intel->need_throttle = true;
+ brw->need_throttle = true;
}
void
intelFinish(struct gl_context * ctx)
{
- struct intel_context *intel = intel_context(ctx);
+ struct brw_context *brw = brw_context(ctx);
- intel_flush(ctx);
- intel_flush_front(ctx);
+ intel_glFlush(ctx);
- if (intel->batch.last_bo)
- drm_intel_bo_wait_rendering(intel->batch.last_bo);
+ if (brw->batch.last_bo)
+ drm_intel_bo_wait_rendering(brw->batch.last_bo);
}
void
intelInitPixelFuncs(functions);
intelInitBufferObjectFuncs(functions);
intel_init_syncobj_functions(functions);
+ brw_init_object_purgeable_functions(functions);
}
static bool
struct dd_function_table *functions,
unsigned *dri_ctx_error)
{
- struct intel_context *intel = &brw->intel;
- struct gl_context *ctx = &intel->ctx;
+ struct gl_context *ctx = &brw->ctx;
struct gl_context *shareCtx = (struct gl_context *) sharedContextPrivate;
__DRIscreen *sPriv = driContextPriv->driScreenPriv;
struct intel_screen *intelScreen = sPriv->driverPrivate;
dri_ctx_error))
return false;
+ /* Can't rely on invalidate events, fall back to glViewport hack */
+ if (!driContextPriv->driScreenPriv->dri2.useInvalidate) {
+ brw->saved_viewport = functions->Viewport;
+ functions->Viewport = intel_viewport;
+ }
+
if (mesaVis == NULL) {
memset(&visual, 0, sizeof visual);
mesaVis = &visual;
}
- intel->intelScreen = intelScreen;
+ brw->intelScreen = intelScreen;
+ brw->bufmgr = intelScreen->bufmgr;
- if (!_mesa_initialize_context(&intel->ctx, api, mesaVis, shareCtx,
+ if (!_mesa_initialize_context(&brw->ctx, api, mesaVis, shareCtx,
functions)) {
*dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY;
printf("%s: failed to init mesa context\n", __FUNCTION__);
return false;
}
- driContextPriv->driverPrivate = intel;
- intel->driContext = driContextPriv;
- intel->driFd = sPriv->fd;
+ driContextPriv->driverPrivate = brw;
+ brw->driContext = driContextPriv;
- intel->gen = intelScreen->gen;
+ brw->gen = intelScreen->gen;
const int devID = intelScreen->deviceID;
if (IS_SNB_GT1(devID) || IS_IVB_GT1(devID) || IS_HSW_GT1(devID))
- intel->gt = 1;
+ brw->gt = 1;
else if (IS_SNB_GT2(devID) || IS_IVB_GT2(devID) || IS_HSW_GT2(devID))
- intel->gt = 2;
+ brw->gt = 2;
else if (IS_HSW_GT3(devID))
- intel->gt = 3;
+ brw->gt = 3;
else
- intel->gt = 0;
+ brw->gt = 0;
if (IS_HASWELL(devID)) {
- intel->is_haswell = true;
+ brw->is_haswell = true;
} else if (IS_BAYTRAIL(devID)) {
- intel->is_baytrail = true;
- intel->gt = 1;
+ brw->is_baytrail = true;
+ brw->gt = 1;
} else if (IS_G4X(devID)) {
- intel->is_g4x = true;
+ brw->is_g4x = true;
}
- intel->has_separate_stencil = intel->intelScreen->hw_has_separate_stencil;
- intel->must_use_separate_stencil = intel->intelScreen->hw_must_use_separate_stencil;
- intel->has_hiz = intel->gen >= 6;
- intel->has_llc = intel->intelScreen->hw_has_llc;
- intel->has_swizzling = intel->intelScreen->hw_has_swizzling;
+ brw->has_separate_stencil = brw->intelScreen->hw_has_separate_stencil;
+ brw->must_use_separate_stencil = brw->intelScreen->hw_must_use_separate_stencil;
+ brw->has_hiz = brw->gen >= 6;
+ brw->has_llc = brw->intelScreen->hw_has_llc;
+ brw->has_swizzling = brw->intelScreen->hw_has_swizzling;
memset(&ctx->TextureFormatSupported,
0, sizeof(ctx->TextureFormatSupported));
* taken up by things like the framebuffer and the ringbuffer and such, so
* be more conservative.
*/
- intel->max_gtt_map_object_size = gtt_size / 4;
-
- intel->bufmgr = intelScreen->bufmgr;
+ brw->max_gtt_map_object_size = gtt_size / 4;
bo_reuse_mode = driQueryOptioni(&brw->optionCache, "bo_reuse");
switch (bo_reuse_mode) {
case DRI_CONF_BO_REUSE_DISABLED:
break;
case DRI_CONF_BO_REUSE_ALL:
- intel_bufmgr_gem_enable_reuse(intel->bufmgr);
+ intel_bufmgr_gem_enable_reuse(brw->bufmgr);
break;
}
* software fallbacks (which we have to support on legacy GL to do weird
* glDrawPixels(), glBitmap(), and other functions).
*/
- if (api != API_OPENGL_CORE) {
+ if (api != API_OPENGL_CORE && api != API_OPENGLES2) {
_swrast_CreateContext(ctx);
}
INTEL_DEBUG = driParseDebugString(getenv("INTEL_DEBUG"), debug_control);
if (INTEL_DEBUG & DEBUG_BUFMGR)
- dri_bufmgr_set_debug(intel->bufmgr, true);
- if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && intel->gen < 7) {
+ dri_bufmgr_set_debug(brw->bufmgr, true);
+ if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && brw->gen < 7) {
fprintf(stderr,
"shader_time debugging requires gen7 (Ivybridge) or better.\n");
INTEL_DEBUG &= ~DEBUG_SHADER_TIME;
}
if (INTEL_DEBUG & DEBUG_PERF)
- intel->perf_debug = true;
+ brw->perf_debug = true;
if (INTEL_DEBUG & DEBUG_AUB)
- drm_intel_bufmgr_gem_set_aub_dump(intel->bufmgr, true);
+ drm_intel_bufmgr_gem_set_aub_dump(brw->bufmgr, true);
intel_batchbuffer_init(brw);
intel_fbo_init(brw);
if (!driQueryOptionb(&brw->optionCache, "hiz")) {
- intel->has_hiz = false;
+ brw->has_hiz = false;
/* On gen6, you can only do separate stencil with HIZ. */
- if (intel->gen == 6)
- intel->has_separate_stencil = false;
+ if (brw->gen == 6)
+ brw->has_separate_stencil = false;
}
if (driQueryOptionb(&brw->optionCache, "always_flush_batch")) {
fprintf(stderr, "flushing batchbuffer before/after each draw call\n");
- intel->always_flush_batch = 1;
+ brw->always_flush_batch = 1;
}
if (driQueryOptionb(&brw->optionCache, "always_flush_cache")) {
fprintf(stderr, "flushing GPU caches before/after each draw call\n");
- intel->always_flush_cache = 1;
+ brw->always_flush_cache = 1;
}
if (driQueryOptionb(&brw->optionCache, "disable_throttling")) {
fprintf(stderr, "disabling flush throttling\n");
- intel->disable_throttling = 1;
+ brw->disable_throttling = 1;
}
return true;
{
struct brw_context *brw =
(struct brw_context *) driContextPriv->driverPrivate;
- struct intel_context *intel = &brw->intel;
- struct gl_context *ctx = &intel->ctx;
+ struct gl_context *ctx = &brw->ctx;
- assert(intel); /* should never be null */
- if (intel) {
+ assert(brw); /* should never be null */
+ if (brw) {
/* Dump a final BMP in case the application doesn't call SwapBuffers */
if (INTEL_DEBUG & DEBUG_AUB) {
intel_batchbuffer_flush(brw);
- aub_dump_bmp(&intel->ctx);
+ aub_dump_bmp(&brw->ctx);
}
- _mesa_meta_free(&intel->ctx);
+ _mesa_meta_free(&brw->ctx);
brw->vtbl.destroy(brw);
if (ctx->swrast_context) {
- _swsetup_DestroyContext(&intel->ctx);
- _tnl_DestroyContext(&intel->ctx);
+ _swsetup_DestroyContext(&brw->ctx);
+ _tnl_DestroyContext(&brw->ctx);
}
- _vbo_DestroyContext(&intel->ctx);
+ _vbo_DestroyContext(&brw->ctx);
if (ctx->swrast_context)
- _swrast_DestroyContext(&intel->ctx);
+ _swrast_DestroyContext(&brw->ctx);
intel_batchbuffer_free(brw);
- drm_intel_bo_unreference(intel->first_post_swapbuffers_batch);
- intel->first_post_swapbuffers_batch = NULL;
+ drm_intel_bo_unreference(brw->first_post_swapbuffers_batch);
+ brw->first_post_swapbuffers_batch = NULL;
driDestroyOptionCache(&brw->optionCache);
/* free the Mesa context */
- _mesa_free_context_data(&intel->ctx);
+ _mesa_free_context_data(&brw->ctx);
- ralloc_free(intel);
+ ralloc_free(brw);
driContextPriv->driverPrivate = NULL;
}
}
intel_gles3_srgb_workaround(struct brw_context *brw,
struct gl_framebuffer *fb)
{
- struct intel_context *intel = &brw->intel;
- struct gl_context *ctx = &intel->ctx;
+ struct gl_context *ctx = &brw->ctx;
if (_mesa_is_desktop_gl(ctx) || !fb->Visual.sRGBCapable)
return;
_mesa_flush(curCtx);
}
- struct intel_context *intel = &brw->intel;
-
if (driContextPriv) {
- struct gl_context *ctx = &intel->ctx;
+ struct gl_context *ctx = &brw->ctx;
struct gl_framebuffer *fb, *readFb;
if (driDrawPriv == NULL && driReadPriv == NULL) {
driContextPriv->dri2.read_stamp = driReadPriv->dri2.stamp - 1;
}
+ /* The sRGB workaround changes the renderbuffer's format. We must change
+ * the format before the renderbuffer's miptree get's allocated, otherwise
+ * the formats of the renderbuffer and its miptree will differ.
+ */
+ intel_gles3_srgb_workaround(brw, fb);
+ intel_gles3_srgb_workaround(brw, readFb);
+
intel_prepare_render(brw);
_mesa_make_current(ctx, fb, readFb);
-
- intel_gles3_srgb_workaround(brw, ctx->WinSysDrawBuffer);
- intel_gles3_srgb_workaround(brw, ctx->WinSysReadBuffer);
}
else {
_mesa_make_current(NULL, NULL, NULL);
__DRIbuffer **buffers,
int *buffer_count)
{
- struct intel_context *intel = &brw->intel;
- __DRIscreen *screen = intel->intelScreen->driScrnPriv;
+ __DRIscreen *screen = brw->intelScreen->driScrnPriv;
struct gl_framebuffer *fb = drawable->driverPrivate;
int i = 0;
unsigned attachments[8];
* query, we need to make sure all the pending drawing has landed in the
* real front buffer.
*/
- intel_flush(&intel->ctx);
- intel_flush_front(&intel->ctx);
+ intel_batchbuffer_flush(brw);
+ intel_flush_front(&brw->ctx);
attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
attachments[i++] = intel_bits_per_pixel(front_rb);
* So before doing the query, make sure all the pending drawing has
* landed in the real front buffer.
*/
- intel_flush(&intel->ctx);
- intel_flush_front(&intel->ctx);
+ intel_batchbuffer_flush(brw);
+ intel_flush_front(&brw->ctx);
}
if (back_rb) {
struct intel_renderbuffer *rb,
const char *buffer_name)
{
- struct intel_context *intel = &brw->intel;
struct intel_region *region = NULL;
if (!rb)
}
intel_miptree_release(&rb->mt);
- region = intel_region_alloc_for_handle(intel->intelScreen,
+ region = intel_region_alloc_for_handle(brw->intelScreen,
buffer->cpp,
drawable->w,
drawable->h,
projects / mesa.git / blobdiff