X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi915%2Fintel_pixel_bitmap.c;h=8dee0bea9f2115e3c37a19b566ce594368ac12b0;hb=4e9e964de6cbf540f15b481d37b310f514331d1b;hp=a41b6929c62ca7531a3ac40f77fd6f0b85398f3a;hpb=139e6c7c4a9c59be5f4b3f431ac393cc097326ac;p=mesa.git diff --git a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c index a41b6929c62..8dee0bea9f2 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c @@ -262,8 +262,8 @@ do_blit_bitmap( struct gl_context *ctx, int h = MIN2(DY, height - py); int w = MIN2(DX, width - px); GLuint sz = ALIGN(ALIGN(w,8) * h, 64)/8; - GLenum logic_op = ctx->Color.ColorLogicOpEnabled ? - ctx->Color.LogicOp : GL_COPY; + const enum gl_logicop_mode logic_op = ctx->Color.ColorLogicOpEnabled ? + ctx->Color._LogicOp : COLOR_LOGICOP_COPY; assert(sz <= sizeof(stipple)); memset(stipple, 0, sz);