OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Remove remaining dri2.enabled tests

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-01-01 23:26:03 -05:00
parent 2861d9200b
commit 5a0b60aa1b
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/drivers/dri/intel/intel_context.c
View File

@@ -389,9 +389,6 @@ intel_viewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
void (*old_viewport)(GLcontext *ctx, GLint x, GLint y, void (*old_viewport)(GLcontext *ctx, GLint x, GLint y,
GLsizei w, GLsizei h); GLsizei w, GLsizei h);
if (!driContext->driScreenPriv->dri2.enabled)
return;
if (!intel->meta.internal_viewport_call && ctx->DrawBuffer->Name == 0) { if (!intel->meta.internal_viewport_call && ctx->DrawBuffer->Name == 0) {
/* If we're rendering to the fake front buffer, make sure all the pending /* If we're rendering to the fake front buffer, make sure all the pending
* drawing has landed on the real front buffer. Otherwise when we * drawing has landed on the real front buffer. Otherwise when we
@@ -475,13 +472,6 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
if (intel->gen < 4) if (intel->gen < 4)
INTEL_FIREVERTICES(intel); INTEL_FIREVERTICES(intel);
/* Emit a flush so that any frontbuffer rendering that might have occurred
* lands onscreen in a timely manner, even if the X Server doesn't trigger
* a flush for us.
*/
if (!intel->driScreen->dri2.enabled && needs_mi_flush)
intel_batchbuffer_emit_mi_flush(intel->batch);
if (intel->batch->map != intel->batch->ptr) if (intel->batch->map != intel->batch->ptr)
intel_batchbuffer_flush(intel->batch); intel_batchbuffer_flush(intel->batch);

17
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -278,28 +278,11 @@ intelCreateContext(const __GLcontextModes * mesaVis,
static GLboolean static GLboolean
intel_init_bufmgr(intelScreenPrivate *intelScreen) intel_init_bufmgr(intelScreenPrivate *intelScreen)
{ {
int gem_kernel = 0;
struct drm_i915_getparam gp;
__DRIscreen *spriv = intelScreen->driScrnPriv; __DRIscreen *spriv = intelScreen->driScrnPriv;
int num_fences = 0; int num_fences = 0;
intelScreen->no_hw = getenv("INTEL_NO_HW") != NULL; intelScreen->no_hw = getenv("INTEL_NO_HW") != NULL;
gp.param = I915_PARAM_HAS_GEM;
gp.value = &gem_kernel;
(void) drmCommandWriteRead(spriv->fd, DRM_I915_GETPARAM, &gp, sizeof(gp));
/* If we've got a new enough DDX that's initializing GEM and giving us
* object handles for the shared buffers, use that.
*/
if (!intelScreen->driScrnPriv->dri2.enabled &&
intelScreen->driScrnPriv->ddx_version.minor < 9) {
fprintf(stderr, "[%s:%u] Error initializing GEM.\n",
__func__, __LINE__);
return GL_FALSE;
}
intelScreen->bufmgr = intel_bufmgr_gem_init(spriv->fd, BATCH_SZ); intelScreen->bufmgr = intel_bufmgr_gem_init(spriv->fd, BATCH_SZ);
/* Otherwise, use the classic buffer manager. */ /* Otherwise, use the classic buffer manager. */
if (intelScreen->bufmgr == NULL) { if (intelScreen->bufmgr == NULL) {