diff options
Diffstat (limited to 'src')
24 files changed, 107 insertions, 107 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index 3e379f30045..13adf560835 100644 --- a/src/mesa/drivers/dri/i915/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c @@ -56,7 +56,7 @@ i830StencilFuncSeparate(struct gl_context * ctx, GLenum face, GLenum func, GLint mask = mask & 0xff; - DBG("%s : func: %s, ref : 0x%x, mask: 0x%x\n", __FUNCTION__, + DBG("%s : func: %s, ref : 0x%x, mask: 0x%x\n", __func__, _mesa_lookup_enum_by_nr(func), ref, mask); @@ -77,7 +77,7 @@ i830StencilMaskSeparate(struct gl_context * ctx, GLenum face, GLuint mask) { struct i830_context *i830 = i830_context(ctx); - DBG("%s : mask 0x%x\n", __FUNCTION__, mask); + DBG("%s : mask 0x%x\n", __func__, mask); mask = mask & 0xff; @@ -94,7 +94,7 @@ i830StencilOpSeparate(struct gl_context * ctx, GLenum face, GLenum fail, GLenum struct i830_context *i830 = i830_context(ctx); int fop, dfop, dpop; - DBG("%s: fail : %s, zfail: %s, zpass : %s\n", __FUNCTION__, + DBG("%s: fail : %s, zfail: %s, zpass : %s\n", __func__, _mesa_lookup_enum_by_nr(fail), _mesa_lookup_enum_by_nr(zfail), _mesa_lookup_enum_by_nr(zpass)); @@ -261,7 +261,7 @@ i830BlendColor(struct gl_context * ctx, const GLfloat color[4]) struct i830_context *i830 = i830_context(ctx); GLubyte r, g, b, a; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); UNCLAMPED_FLOAT_TO_UBYTE(r, color[RCOMP]); UNCLAMPED_FLOAT_TO_UBYTE(g, color[GCOMP]); @@ -315,7 +315,7 @@ i830_set_blend_state(struct gl_context * ctx) break; default: fprintf(stderr, "[%s:%u] Invalid RGB blend equation (0x%04x).\n", - __FUNCTION__, __LINE__, ctx->Color.Blend[0].EquationRGB); + __func__, __LINE__, ctx->Color.Blend[0].EquationRGB); return; } @@ -343,7 +343,7 @@ i830_set_blend_state(struct gl_context * ctx) break; default: fprintf(stderr, "[%s:%u] Invalid alpha blend equation (0x%04x).\n", - __FUNCTION__, __LINE__, ctx->Color.Blend[0].EquationA); + __func__, __LINE__, ctx->Color.Blend[0].EquationA); return; } @@ -378,7 +378,7 @@ i830_set_blend_state(struct gl_context * ctx) if (0) { fprintf(stderr, "[%s:%u] STATE1: 0x%08x IALPHAB: 0x%08x blend is %sabled\n", - __FUNCTION__, __LINE__, i830->state.Ctx[I830_CTXREG_STATE1], + __func__, __LINE__, i830->state.Ctx[I830_CTXREG_STATE1], i830->state.Ctx[I830_CTXREG_IALPHAB], (ctx->Color.BlendEnabled) ? "en" : "dis"); } @@ -388,7 +388,7 @@ i830_set_blend_state(struct gl_context * ctx) static void i830BlendEquationSeparate(struct gl_context * ctx, GLenum modeRGB, GLenum modeA) { - DBG("%s -> %s, %s\n", __FUNCTION__, + DBG("%s -> %s, %s\n", __func__, _mesa_lookup_enum_by_nr(modeRGB), _mesa_lookup_enum_by_nr(modeA)); @@ -402,7 +402,7 @@ static void i830BlendFuncSeparate(struct gl_context * ctx, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA) { - DBG("%s -> RGB(%s, %s) A(%s, %s)\n", __FUNCTION__, + DBG("%s -> RGB(%s, %s) A(%s, %s)\n", __func__, _mesa_lookup_enum_by_nr(sfactorRGB), _mesa_lookup_enum_by_nr(dfactorRGB), _mesa_lookup_enum_by_nr(sfactorA), @@ -423,7 +423,7 @@ i830DepthFunc(struct gl_context * ctx, GLenum func) struct i830_context *i830 = i830_context(ctx); int test = intel_translate_compare_func(func); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); I830_STATECHANGE(i830, I830_UPLOAD_CTX); i830->state.Ctx[I830_CTXREG_STATE3] &= ~DEPTH_TEST_FUNC_MASK; @@ -436,7 +436,7 @@ i830DepthMask(struct gl_context * ctx, GLboolean flag) { struct i830_context *i830 = i830_context(ctx); - DBG("%s flag (%d)\n", __FUNCTION__, flag); + DBG("%s flag (%d)\n", __func__, flag); if (!ctx->DrawBuffer || !ctx->DrawBuffer->Visual.depthBits) flag = false; @@ -535,7 +535,7 @@ i830Scissor(struct gl_context * ctx) if (!ctx->DrawBuffer) return; - DBG("%s %d,%d %dx%d\n", __FUNCTION__, + DBG("%s %d,%d %dx%d\n", __func__, ctx->Scissor.ScissorArray[0].X, ctx->Scissor.ScissorArray[0].Y, ctx->Scissor.ScissorArray[0].Width, ctx->Scissor.ScissorArray[0].Height); @@ -546,7 +546,7 @@ i830Scissor(struct gl_context * ctx) x2 = ctx->Scissor.ScissorArray[0].X + ctx->Scissor.ScissorArray[0].Width - 1; y2 = y1 + ctx->Scissor.ScissorArray[0].Height - 1; - DBG("%s %d..%d,%d..%d (inverted)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (inverted)\n", __func__, x1, x2, y1, y2); } else { /* FBO - not inverted @@ -557,7 +557,7 @@ i830Scissor(struct gl_context * ctx) + ctx->Scissor.ScissorArray[0].Width - 1; y2 = ctx->Scissor.ScissorArray[0].Y + ctx->Scissor.ScissorArray[0].Height - 1; - DBG("%s %d..%d,%d..%d (not inverted)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (not inverted)\n", __func__, x1, x2, y1, y2); } x1 = CLAMP(x1, 0, ctx->DrawBuffer->Width - 1); @@ -565,7 +565,7 @@ i830Scissor(struct gl_context * ctx) x2 = CLAMP(x2, 0, ctx->DrawBuffer->Width - 1); y2 = CLAMP(y2, 0, ctx->DrawBuffer->Height - 1); - DBG("%s %d..%d,%d..%d (clamped)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (clamped)\n", __func__, x1, x2, y1, y2); I830_STATECHANGE(i830, I830_UPLOAD_BUFFERS); i830->state.Buffer[I830_DESTREG_SR1] = (y1 << 16) | (x1 & 0xffff); @@ -578,7 +578,7 @@ i830LogicOp(struct gl_context * ctx, GLenum opcode) struct i830_context *i830 = i830_context(ctx); int tmp = intel_translate_logic_op(opcode); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); I830_STATECHANGE(i830, I830_UPLOAD_CTX); i830->state.Ctx[I830_CTXREG_STATE4] &= ~LOGICOP_MASK; @@ -593,7 +593,7 @@ i830CullFaceFrontFace(struct gl_context * ctx, GLenum unused) struct i830_context *i830 = i830_context(ctx); GLuint mode; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (!ctx->Polygon.CullFlag) { mode = CULLMODE_NONE; @@ -622,7 +622,7 @@ i830LineWidth(struct gl_context * ctx, GLfloat widthf) int width; int state5; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); width = (int) (widthf * 2); width = CLAMP(width, 1, 15); @@ -642,7 +642,7 @@ i830PointSize(struct gl_context * ctx, GLfloat size) struct i830_context *i830 = i830_context(ctx); GLint point_size = (int) size; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); point_size = CLAMP(point_size, 1, 256); I830_STATECHANGE(i830, I830_UPLOAD_CTX); @@ -663,7 +663,7 @@ i830ColorMask(struct gl_context * ctx, struct i830_context *i830 = i830_context(ctx); GLuint tmp = 0; - DBG("%s r(%d) g(%d) b(%d) a(%d)\n", __FUNCTION__, r, g, b, a); + DBG("%s r(%d) g(%d) b(%d) a(%d)\n", __func__, r, g, b, a); tmp = ((i830->state.Ctx[I830_CTXREG_ENABLES_2] & ~WRITEMASK_MASK) | ENABLE_COLOR_MASK | @@ -695,7 +695,7 @@ update_specular(struct gl_context * ctx) static void i830LightModelfv(struct gl_context * ctx, GLenum pname, const GLfloat * param) { - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) { update_specular(ctx); @@ -738,7 +738,7 @@ i830Fogfv(struct gl_context * ctx, GLenum pname, const GLfloat * param) { struct i830_context *i830 = i830_context(ctx); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (pname == GL_FOG_COLOR) { GLuint color = (((GLubyte) (ctx->Fog.Color[0] * 255.0F) << 16) | diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index ebfce7fe4fc..661e424b53f 100644 --- a/src/mesa/drivers/dri/i915/i830_texblend.c +++ b/src/mesa/drivers/dri/i915/i830_texblend.c @@ -159,7 +159,7 @@ i830SetTexEnvCombine(struct i830_context * i830, }; if (INTEL_DEBUG & DEBUG_TEXTURE) - fprintf(stderr, "%s\n", __FUNCTION__); + fprintf(stderr, "%s\n", __func__); /* The EXT version of the DOT3 extension does not support the @@ -395,7 +395,7 @@ emit_texblend(struct i830_context *i830, GLuint unit, GLuint blendUnit, if (0) - fprintf(stderr, "%s unit %d\n", __FUNCTION__, unit); + fprintf(stderr, "%s unit %d\n", __func__, unit); /* Update i830->state.TexBlend */ diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c index 00731e6d05f..83cd7336ec1 100644 --- a/src/mesa/drivers/dri/i915/i830_texstate.c +++ b/src/mesa/drivers/dri/i915/i830_texstate.c @@ -74,7 +74,7 @@ translate_texture_format(GLuint mesa_format) case MESA_FORMAT_RGBA_DXT5: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT4_5); default: - fprintf(stderr, "%s: bad image format %s\n", __FUNCTION__, + fprintf(stderr, "%s: bad image format %s\n", __func__, _mesa_get_format_name(mesa_format)); abort(); return 0; diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c index d1bfcfe019c..64b0b4ddb03 100644 --- a/src/mesa/drivers/dri/i915/i915_program.c +++ b/src/mesa/drivers/dri/i915/i915_program.c @@ -322,7 +322,7 @@ i915_emit_const1f(struct i915_fragment_program * p, GLfloat c0) } } - fprintf(stderr, "%s: out of constants\n", __FUNCTION__); + fprintf(stderr, "%s: out of constants\n", __func__); p->error = 1; return 0; } @@ -359,7 +359,7 @@ i915_emit_const2f(struct i915_fragment_program * p, GLfloat c0, GLfloat c1) } } - fprintf(stderr, "%s: out of constants\n", __FUNCTION__); + fprintf(stderr, "%s: out of constants\n", __func__); p->error = 1; return 0; } @@ -391,7 +391,7 @@ i915_emit_const4f(struct i915_fragment_program * p, } } - fprintf(stderr, "%s: out of constants\n", __FUNCTION__); + fprintf(stderr, "%s: out of constants\n", __func__); p->error = 1; return 0; } @@ -430,7 +430,7 @@ i915_emit_param4fv(struct i915_fragment_program * p, const GLfloat * values) } } - fprintf(stderr, "%s: out of constants\n", __FUNCTION__); + fprintf(stderr, "%s: out of constants\n", __func__); p->error = 1; return 0; } diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 32e5f98ce67..f12bf8af991 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -241,7 +241,7 @@ i915BlendColor(struct gl_context * ctx, const GLfloat color[4]) GLubyte r, g, b, a; GLuint dw; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); UNCLAMPED_FLOAT_TO_UBYTE(r, color[RCOMP]); UNCLAMPED_FLOAT_TO_UBYTE(g, color[GCOMP]); @@ -357,7 +357,7 @@ i915DepthFunc(struct gl_context * ctx, GLenum func) int test = intel_translate_compare_func(func); GLuint dw; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); dw = i915->state.Ctx[I915_CTXREG_LIS6]; dw &= ~S6_DEPTH_TEST_FUNC_MASK; @@ -374,7 +374,7 @@ i915DepthMask(struct gl_context * ctx, GLboolean flag) struct i915_context *i915 = I915_CONTEXT(ctx); GLuint dw; - DBG("%s flag (%d)\n", __FUNCTION__, flag); + DBG("%s flag (%d)\n", __func__, flag); if (!ctx->DrawBuffer || !ctx->DrawBuffer->Visual.depthBits) flag = false; @@ -501,7 +501,7 @@ i915Scissor(struct gl_context * ctx) if (!ctx->DrawBuffer) return; - DBG("%s %d,%d %dx%d\n", __FUNCTION__, + DBG("%s %d,%d %dx%d\n", __func__, ctx->Scissor.ScissorArray[0].X, ctx->Scissor.ScissorArray[0].Y, ctx->Scissor.ScissorArray[0].Width, ctx->Scissor.ScissorArray[0].Height); @@ -512,7 +512,7 @@ i915Scissor(struct gl_context * ctx) x2 = ctx->Scissor.ScissorArray[0].X + ctx->Scissor.ScissorArray[0].Width - 1; y2 = y1 + ctx->Scissor.ScissorArray[0].Height - 1; - DBG("%s %d..%d,%d..%d (inverted)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (inverted)\n", __func__, x1, x2, y1, y2); } else { /* FBO - not inverted @@ -523,7 +523,7 @@ i915Scissor(struct gl_context * ctx) + ctx->Scissor.ScissorArray[0].Width - 1; y2 = ctx->Scissor.ScissorArray[0].Y + ctx->Scissor.ScissorArray[0].Height - 1; - DBG("%s %d..%d,%d..%d (not inverted)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (not inverted)\n", __func__, x1, x2, y1, y2); } x1 = CLAMP(x1, 0, ctx->DrawBuffer->Width - 1); @@ -531,7 +531,7 @@ i915Scissor(struct gl_context * ctx) x2 = CLAMP(x2, 0, ctx->DrawBuffer->Width - 1); y2 = CLAMP(y2, 0, ctx->DrawBuffer->Height - 1); - DBG("%s %d..%d,%d..%d (clamped)\n", __FUNCTION__, x1, x2, y1, y2); + DBG("%s %d..%d,%d..%d (clamped)\n", __func__, x1, x2, y1, y2); I915_STATECHANGE(i915, I915_UPLOAD_BUFFERS); i915->state.Buffer[I915_DESTREG_SR1] = (y1 << 16) | (x1 & 0xffff); @@ -544,7 +544,7 @@ i915LogicOp(struct gl_context * ctx, GLenum opcode) struct i915_context *i915 = I915_CONTEXT(ctx); int tmp = intel_translate_logic_op(opcode); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); I915_STATECHANGE(i915, I915_UPLOAD_CTX); i915->state.Ctx[I915_CTXREG_STATE4] &= ~LOGICOP_MASK; @@ -559,7 +559,7 @@ i915CullFaceFrontFace(struct gl_context * ctx, GLenum unused) struct i915_context *i915 = I915_CONTEXT(ctx); GLuint mode, dw; - DBG("%s %d\n", __FUNCTION__, + DBG("%s %d\n", __func__, ctx->DrawBuffer ? ctx->DrawBuffer->Name : 0); if (!ctx->Polygon.CullFlag) { @@ -595,7 +595,7 @@ i915LineWidth(struct gl_context * ctx, GLfloat widthf) int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_LINE_WIDTH_MASK; int width; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); width = (int) (widthf * 2); width = CLAMP(width, 1, 0xf); @@ -614,7 +614,7 @@ i915PointSize(struct gl_context * ctx, GLfloat size) int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_POINT_WIDTH_MASK; GLint point_size = (int) round(size); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); point_size = CLAMP(point_size, 1, 255); lis4 |= point_size << S4_POINT_WIDTH_SHIFT; @@ -697,7 +697,7 @@ i915ColorMask(struct gl_context * ctx, struct i915_context *i915 = I915_CONTEXT(ctx); GLuint tmp = i915->state.Ctx[I915_CTXREG_LIS5] & ~S5_WRITEDISABLE_MASK; - DBG("%s r(%d) g(%d) b(%d) a(%d)\n", __FUNCTION__, r, g, b, + DBG("%s r(%d) g(%d) b(%d) a(%d)\n", __func__, r, g, b, a); if (!r) @@ -726,7 +726,7 @@ update_specular(struct gl_context * ctx) static void i915LightModelfv(struct gl_context * ctx, GLenum pname, const GLfloat * param) { - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) { update_specular(ctx); diff --git a/src/mesa/drivers/dri/i915/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c index d416d4656e7..e76ccb0b566 100644 --- a/src/mesa/drivers/dri/i915/i915_tex_layout.c +++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c @@ -244,7 +244,7 @@ i915_miptree_layout(struct intel_mipmap_tree * mt) break; } - DBG("%s: %dx%dx%d\n", __FUNCTION__, + DBG("%s: %dx%dx%d\n", __func__, mt->total_width, mt->total_height, mt->cpp); } @@ -476,6 +476,6 @@ i945_miptree_layout(struct intel_mipmap_tree * mt) break; } - DBG("%s: %dx%dx%d\n", __FUNCTION__, + DBG("%s: %dx%dx%d\n", __func__, mt->total_width, mt->total_height, mt->cpp); } diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 000ab6eb7f3..aef5ff99eb2 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -97,7 +97,7 @@ translate_texture_format(mesa_format mesa_format, GLenum DepthMode) else return (MAPSURF_32BIT | MT_32BIT_x8L24); default: - fprintf(stderr, "%s: bad image format %s\n", __FUNCTION__, + fprintf(stderr, "%s: bad image format %s\n", __func__, _mesa_get_format_name(mesa_format)); abort(); return 0; diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 706e0c3d6a2..97bf81ed759 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -356,7 +356,7 @@ i915_emit_state(struct intel_context *intel) assert(get_dirty(state) == 0); if (INTEL_DEBUG & DEBUG_STATE) - fprintf(stderr, "%s dirty: %x\n", __FUNCTION__, dirty); + fprintf(stderr, "%s dirty: %x\n", __func__, dirty); if (dirty & I915_UPLOAD_INVARIENT) { if (INTEL_DEBUG & DEBUG_STATE) diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c index 9a68625318a..279db28b7eb 100644 --- a/src/mesa/drivers/dri/i915/intel_blit.c +++ b/src/mesa/drivers/dri/i915/intel_blit.c @@ -134,7 +134,7 @@ intel_miptree_blit(struct intel_context *intel, (dst_format != MESA_FORMAT_B8G8R8A8_UNORM && dst_format != MESA_FORMAT_B8G8R8X8_UNORM))) { perf_debug("%s: Can't use hardware blitter from %s to %s, " - "falling back.\n", __FUNCTION__, + "falling back.\n", __func__, _mesa_get_format_name(src_format), _mesa_get_format_name(dst_format)); return false; @@ -266,7 +266,7 @@ intelEmitCopyBlit(struct intel_context *intel, intel_batchbuffer_require_space(intel, 8 * 4); DBG("%s src:buf(%p)/%d+%d %d,%d dst:buf(%p)/%d+%d %d,%d sz:%dx%d\n", - __FUNCTION__, + __func__, src_buffer, src_pitch, src_offset, src_x, src_y, dst_buffer, dst_pitch, dst_offset, dst_x, dst_y, w, h); @@ -421,7 +421,7 @@ intelClearWithBlit(struct gl_context *ctx, GLbitfield mask) cpp = region->cpp; DBG("%s dst:buf(%p)/%d %d,%d sz:%dx%d\n", - __FUNCTION__, + __func__, region->bo, pitch, x1, y1, x2 - x1, y2 - y1); @@ -542,7 +542,7 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel, return true; DBG("%s dst:buf(%p)/%d+%d %d,%d sz:%dx%d, %d bytes %d dwords\n", - __FUNCTION__, + __func__, dst_buffer, dst_pitch, dst_offset, x, y, w, h, src_size, dwords); intel_batchbuffer_require_space(intel, @@ -658,7 +658,7 @@ intel_miptree_set_alpha_to_one(struct intel_context *intel, cpp = region->cpp; DBG("%s dst:buf(%p)/%d %d,%d sz:%dx%d\n", - __FUNCTION__, region->bo, pitch, x, y, width, height); + __func__, region->bo, pitch, x, y, width, height); BR13 = br13_for_cpp(cpp) | 0xf0 << 16; CMD = XY_COLOR_BLT_CMD; diff --git a/src/mesa/drivers/dri/i915/intel_clear.c b/src/mesa/drivers/dri/i915/intel_clear.c index 5374e19ba73..8cf7c142f31 100644 --- a/src/mesa/drivers/dri/i915/intel_clear.c +++ b/src/mesa/drivers/dri/i915/intel_clear.c @@ -94,7 +94,7 @@ intelClear(struct gl_context *ctx, GLbitfield mask) } if (0) - fprintf(stderr, "%s\n", __FUNCTION__); + fprintf(stderr, "%s\n", __func__); /* Get SW clears out of the way: Anything without an intel_renderbuffer */ for (i = 0; i < BUFFER_COUNT; i++) { diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 12a1d2b7d36..5618dcd8358 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -422,7 +422,7 @@ intelInitContext(struct intel_context *intel, if (!_mesa_initialize_context(&intel->ctx, api, mesaVis, shareCtx, functions)) { *dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY; - printf("%s: failed to init mesa context\n", __FUNCTION__); + printf("%s: failed to init mesa context\n", __func__); return false; } diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index 8ce1dbf69de..24c318049c4 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c @@ -135,7 +135,7 @@ intel_map_renderbuffer(struct gl_context *ctx, } DBG("%s: rb %d (%s) mt mapped: (%d, %d) (%dx%d) -> %p/%d\n", - __FUNCTION__, rb->Name, _mesa_get_format_name(rb->Format), + __func__, rb->Name, _mesa_get_format_name(rb->Format), x, y, w, h, map, stride); *out_map = map; @@ -153,7 +153,7 @@ intel_unmap_renderbuffer(struct gl_context *ctx, struct swrast_renderbuffer *srb = (struct swrast_renderbuffer *)rb; struct intel_renderbuffer *irb = intel_renderbuffer(rb); - DBG("%s: rb %d (%s)\n", __FUNCTION__, + DBG("%s: rb %d (%s)\n", __func__, rb->Name, _mesa_get_format_name(rb->Format)); if (srb->Buffer) { @@ -215,7 +215,7 @@ intel_alloc_private_renderbuffer_storage(struct gl_context * ctx, struct gl_rend intel_miptree_release(&irb->mt); - DBG("%s: %s: %s (%dx%d)\n", __FUNCTION__, + DBG("%s: %s: %s (%dx%d)\n", __func__, _mesa_lookup_enum_by_nr(internalFormat), _mesa_get_format_name(rb->Format), width, height); @@ -568,7 +568,7 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb) struct intel_mipmap_tree *depth_mt = NULL, *stencil_mt = NULL; int i; - DBG("%s() on fb %p (%s)\n", __FUNCTION__, + DBG("%s() on fb %p (%s)\n", __func__, fb, (fb == ctx->DrawBuffer ? "drawbuffer" : (fb == ctx->ReadBuffer ? "readbuffer" : "other buffer"))); diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c index b9a629fa9dd..e56b9859377 100644 --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c @@ -80,7 +80,7 @@ intel_miptree_create_layout(struct intel_context *intel, if (!mt) return NULL; - DBG("%s target %s format %s level %d..%d <-- %p\n", __FUNCTION__, + DBG("%s target %s format %s level %d..%d <-- %p\n", __func__, _mesa_lookup_enum_by_nr(target), _mesa_get_format_name(format), first_level, last_level, mt); @@ -381,7 +381,7 @@ intel_miptree_reference(struct intel_mipmap_tree **dst, if (src) { src->refcount++; - DBG("%s %p refcount now %d\n", __FUNCTION__, src, src->refcount); + DBG("%s %p refcount now %d\n", __func__, src, src->refcount); } *dst = src; @@ -394,11 +394,11 @@ intel_miptree_release(struct intel_mipmap_tree **mt) if (!*mt) return; - DBG("%s %p refcount will be %d\n", __FUNCTION__, *mt, (*mt)->refcount - 1); + DBG("%s %p refcount will be %d\n", __func__, *mt, (*mt)->refcount - 1); if (--(*mt)->refcount <= 0) { GLuint i; - DBG("%s deleting %p\n", __FUNCTION__, *mt); + DBG("%s deleting %p\n", __func__, *mt); intel_region_release(&((*mt)->region)); @@ -499,7 +499,7 @@ intel_miptree_set_level_info(struct intel_mipmap_tree *mt, mt->level[level].level_x = x; mt->level[level].level_y = y; - DBG("%s level %d size: %d,%d,%d offset %d,%d\n", __FUNCTION__, + DBG("%s level %d size: %d,%d,%d offset %d,%d\n", __func__, level, w, h, d, x, y); assert(mt->level[level].slice == NULL); @@ -524,7 +524,7 @@ intel_miptree_set_image_offset(struct intel_mipmap_tree *mt, mt->level[level].slice[img].y_offset = mt->level[level].level_y + y; DBG("%s level %d img %d pos %d,%d\n", - __FUNCTION__, level, img, + __func__, level, img, mt->level[level].slice[img].x_offset, mt->level[level].slice[img].y_offset); } @@ -765,7 +765,7 @@ intel_miptree_map_gtt(struct intel_context *intel, map->ptr = base + y * map->stride + x * mt->cpp; } - DBG("%s: %d,%d %dx%d from mt %p (%s) %d,%d = %p/%d\n", __FUNCTION__, + DBG("%s: %d,%d %dx%d from mt %p (%s) %d,%d = %p/%d\n", __func__, map->x, map->y, map->w, map->h, mt, _mesa_get_format_name(mt->format), x, y, map->ptr, map->stride); @@ -811,7 +811,7 @@ intel_miptree_map_blit(struct intel_context *intel, intel_batchbuffer_flush(intel); map->ptr = intel_miptree_map_raw(intel, map->mt); - DBG("%s: %d,%d %dx%d from mt %p (%s) %d,%d = %p/%d\n", __FUNCTION__, + DBG("%s: %d,%d %dx%d from mt %p (%s) %d,%d = %p/%d\n", __func__, map->x, map->y, map->w, map->h, mt, _mesa_get_format_name(mt->format), level, slice, map->ptr, map->stride); @@ -943,7 +943,7 @@ intel_miptree_unmap(struct intel_context *intel, if (!map) return; - DBG("%s: mt %p (%s) level %d slice %d\n", __FUNCTION__, + DBG("%s: mt %p (%s) level %d slice %d\n", __func__, mt, _mesa_get_format_name(mt->format), level, slice); if (map->mt) { diff --git a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c index 70cf413c265..a41b6929c62 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c @@ -119,7 +119,7 @@ static GLuint get_bitmap_rect(GLsizei width, GLsizei height, GLuint count = 0; DBG("%s %d,%d %dx%d bitmap %dx%d skip %d src_offset %d mask %d\n", - __FUNCTION__, x,y,w,h,width,height,unpack->SkipPixels, src_offset, mask); + __func__, x,y,w,h,width,height,unpack->SkipPixels, src_offset, mask); if (invert) { first = h-1; diff --git a/src/mesa/drivers/dri/i915/intel_pixel_copy.c b/src/mesa/drivers/dri/i915/intel_pixel_copy.c index e7b53535177..a7185564e47 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_copy.c @@ -176,7 +176,7 @@ do_blit_copypixels(struct gl_context * ctx, width, height, (ctx->Color.ColorLogicOpEnabled ? ctx->Color.LogicOp : GL_COPY))) { - DBG("%s: blit failure\n", __FUNCTION__); + DBG("%s: blit failure\n", __func__); return false; } @@ -186,7 +186,7 @@ do_blit_copypixels(struct gl_context * ctx, out: intel_check_front_buffer_rendering(intel); - DBG("%s: success\n", __FUNCTION__); + DBG("%s: success\n", __func__); return true; } @@ -197,7 +197,7 @@ intelCopyPixels(struct gl_context * ctx, GLsizei width, GLsizei height, GLint destx, GLint desty, GLenum type) { - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (!_mesa_check_conditional_render(ctx)) return; diff --git a/src/mesa/drivers/dri/i915/intel_pixel_read.c b/src/mesa/drivers/dri/i915/intel_pixel_read.c index ce3ad253cb7..149e921218f 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_read.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_read.c @@ -82,7 +82,7 @@ do_blit_readpixels(struct gl_context * ctx, GLint dst_x, dst_y; GLuint dirty; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); assert(_mesa_is_bufferobj(pack->BufferObj)); @@ -92,12 +92,12 @@ do_blit_readpixels(struct gl_context * ctx, if (ctx->_ImageTransferState || !_mesa_format_matches_format_and_type(irb->mt->format, format, type, false)) { - DBG("%s - bad format for blit\n", __FUNCTION__); + DBG("%s - bad format for blit\n", __func__); return false; } if (pack->SwapBytes || pack->LsbFirst) { - DBG("%s: bad packing params\n", __FUNCTION__); + DBG("%s: bad packing params\n", __func__); return false; } @@ -148,7 +148,7 @@ do_blit_readpixels(struct gl_context * ctx, intel_miptree_release(&pbo_mt); - DBG("%s - DONE\n", __FUNCTION__); + DBG("%s - DONE\n", __func__); return true; } @@ -164,7 +164,7 @@ intelReadPixels(struct gl_context * ctx, intel_flush_rendering_to_batch(ctx); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (_mesa_is_bufferobj(pack->BufferObj)) { /* Using PBOs, so try the BLT based path. */ @@ -173,7 +173,7 @@ intelReadPixels(struct gl_context * ctx, return; } - perf_debug("%s: fallback to CPU mapping in PBO case\n", __FUNCTION__); + perf_debug("%s: fallback to CPU mapping in PBO case\n", __func__); } /* glReadPixels() wont dirty the front buffer, so reset the dirty diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c index 5768357f193..c9b776d1a0f 100644 --- a/src/mesa/drivers/dri/i915/intel_regions.c +++ b/src/mesa/drivers/dri/i915/intel_regions.c @@ -124,7 +124,7 @@ intel_region_alloc_internal(struct intel_screen *screen, region->bo = buffer; region->tiling = tiling; - _DBG("%s <-- %p\n", __FUNCTION__, region); + _DBG("%s <-- %p\n", __func__, region); return region; } @@ -241,7 +241,7 @@ intel_region_alloc_for_fd(struct intel_screen *screen, void intel_region_reference(struct intel_region **dst, struct intel_region *src) { - _DBG("%s: %p(%d) -> %p(%d)\n", __FUNCTION__, + _DBG("%s: %p(%d) -> %p(%d)\n", __func__, *dst, *dst ? (*dst)->refcount : 0, src, src ? src->refcount : 0); if (src != *dst) { @@ -260,11 +260,11 @@ intel_region_release(struct intel_region **region_handle) struct intel_region *region = *region_handle; if (region == NULL) { - _DBG("%s NULL\n", __FUNCTION__); + _DBG("%s NULL\n", __func__); return; } - _DBG("%s %p %d\n", __FUNCTION__, region, region->refcount - 1); + _DBG("%s %p %d\n", __func__, region, region->refcount - 1); assert(region->refcount > 0); region->refcount--; diff --git a/src/mesa/drivers/dri/i915/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c index bf48f384ede..0b0d48e1663 100644 --- a/src/mesa/drivers/dri/i915/intel_render.c +++ b/src/mesa/drivers/dri/i915/intel_render.c @@ -113,7 +113,7 @@ static void intelDmaPrimitive(struct intel_context *intel, GLenum prim) { if (0) - fprintf(stderr, "%s %s\n", __FUNCTION__, _mesa_lookup_enum_by_nr(prim)); + fprintf(stderr, "%s %s\n", __func__, _mesa_lookup_enum_by_nr(prim)); INTEL_FIREVERTICES(intel); intel->vtbl.reduced_primitive_state(intel, reduced_prim[prim]); intel_set_prim(intel, hw_prim[prim]); diff --git a/src/mesa/drivers/dri/i915/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c index 5846b5818f3..c951ff731b8 100644 --- a/src/mesa/drivers/dri/i915/intel_state.c +++ b/src/mesa/drivers/dri/i915/intel_state.c @@ -58,7 +58,7 @@ intel_translate_shadow_compare_func(GLenum func) return COMPAREFUNC_NEVER; } - fprintf(stderr, "Unknown value in %s: %x\n", __FUNCTION__, func); + fprintf(stderr, "Unknown value in %s: %x\n", __func__, func); return COMPAREFUNC_NEVER; } @@ -84,7 +84,7 @@ intel_translate_compare_func(GLenum func) return COMPAREFUNC_ALWAYS; } - fprintf(stderr, "Unknown value in %s: %x\n", __FUNCTION__, func); + fprintf(stderr, "Unknown value in %s: %x\n", __func__, func); return COMPAREFUNC_ALWAYS; } @@ -149,7 +149,7 @@ intel_translate_blend_factor(GLenum factor) return BLENDFACT_INV_CONST_ALPHA; } - fprintf(stderr, "Unknown value in %s: %x\n", __FUNCTION__, factor); + fprintf(stderr, "Unknown value in %s: %x\n", __func__, factor); return BLENDFACT_ZERO; } diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index ce17395778e..4c48d3bd3eb 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -14,7 +14,7 @@ static struct gl_texture_image * intelNewTextureImage(struct gl_context * ctx) { - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); (void) ctx; return (struct gl_texture_image *) CALLOC_STRUCT(intel_texture_image); } @@ -34,7 +34,7 @@ intelNewTextureObject(struct gl_context * ctx, GLuint name, GLenum target) (void) ctx; - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (obj == NULL) return NULL; @@ -80,7 +80,7 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx, intel_miptree_match_image(intel_texobj->mt, image)) { intel_miptree_reference(&intel_image->mt, intel_texobj->mt); DBG("%s: alloc obj %p level %d %dx%dx%d using object's miptree %p\n", - __FUNCTION__, texobj, image->Level, + __func__, texobj, image->Level, image->Width, image->Height, image->Depth, intel_texobj->mt); } else { intel_image->mt = intel_miptree_create_for_teximage(intel, intel_texobj, @@ -95,7 +95,7 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx, intel_miptree_reference(&intel_texobj->mt, intel_image->mt); DBG("%s: alloc obj %p level %d %dx%dx%d using new miptree %p\n", - __FUNCTION__, texobj, image->Level, + __func__, texobj, image->Level, image->Width, image->Height, image->Depth, intel_image->mt); } @@ -110,7 +110,7 @@ intel_free_texture_image_buffer(struct gl_context * ctx, { struct intel_texture_image *intelImage = intel_texture_image(texImage); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); intel_miptree_release(&intelImage->mt); diff --git a/src/mesa/drivers/dri/i915/intel_tex_copy.c b/src/mesa/drivers/dri/i915/intel_tex_copy.c index 33e4aa8ed40..a5d00af3b9d 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i915/intel_tex_copy.c @@ -59,7 +59,7 @@ intel_copy_texsubimage(struct intel_context *intel, if (!intelImage->mt || !irb || !irb->mt) { if (unlikely(INTEL_DEBUG & DEBUG_PERF)) fprintf(stderr, "%s fail %p %p (0x%08x)\n", - __FUNCTION__, intelImage->mt, irb, internalFormat); + __func__, intelImage->mt, irb, internalFormat); return false; } @@ -97,7 +97,7 @@ intelCopyTexSubImage(struct gl_context *ctx, GLuint dims, } /* Otherwise, fall back to meta. This will likely be slow. */ - perf_debug("%s - fallback to swrast\n", __FUNCTION__); + perf_debug("%s - fallback to swrast\n", __func__); _mesa_meta_CopyTexSubImage(ctx, dims, texImage, xoffset, yoffset, slice, rb, x, y, width, height); diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c index 57674b9b5cf..01de966a134 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_image.c +++ b/src/mesa/drivers/dri/i915/intel_tex_image.c @@ -42,7 +42,7 @@ intel_miptree_create_for_teximage(struct intel_context *intel, intel_miptree_get_dimensions_for_image(&intelImage->base.Base, &width, &height, &depth); - DBG("%s\n", __FUNCTION__); + DBG("%s\n", __func__); if (intelImage->base.Base.Level > intelObj->base.BaseLevel && (width == 1 || @@ -122,28 +122,28 @@ try_pbo_upload(struct gl_context *ctx, if (intel->ctx._ImageTransferState || unpack->SkipPixels || unpack->SkipRows) { - DBG("%s: image transfer\n", __FUNCTION__); + DBG("%s: image transfer\n", __func__); return false; } ctx->Driver.AllocTextureImageBuffer(ctx, image); if (!intelImage->mt) { - DBG("%s: no miptree\n", __FUNCTION__); + DBG("%s: no miptree\n", __func__); return false; } if (!_mesa_format_matches_format_and_type(intelImage->mt->format, format, type, false)) { DBG("%s: format mismatch (upload to %s with format 0x%x, type 0x%x)\n", - __FUNCTION__, _mesa_get_format_name(intelImage->mt->format), + __func__, _mesa_get_format_name(intelImage->mt->format), format, type); return false; } if (image->TexObject->Target == GL_TEXTURE_1D_ARRAY || image->TexObject->Target == GL_TEXTURE_2D_ARRAY) { - DBG("%s: no support for array textures\n", __FUNCTION__); + DBG("%s: no support for array textures\n", __func__); return false; } @@ -170,14 +170,14 @@ try_pbo_upload(struct gl_context *ctx, intelImage->mt, image->Level, image->Face, 0, 0, false, image->Width, image->Height, GL_COPY)) { - DBG("%s: blit failed\n", __FUNCTION__); + DBG("%s: blit failed\n", __func__); intel_miptree_release(&pbo_mt); return false; } intel_miptree_release(&pbo_mt); - DBG("%s: success\n", __FUNCTION__); + DBG("%s: success\n", __func__); return true; } @@ -188,7 +188,7 @@ intelTexImage(struct gl_context * ctx, GLenum format, GLenum type, const void *pixels, const struct gl_pixelstore_attrib *unpack) { - DBG("%s target %s level %d %dx%dx%d\n", __FUNCTION__, + DBG("%s target %s level %d %dx%dx%d\n", __func__, _mesa_lookup_enum_by_nr(texImage->TexObject->Target), texImage->Level, texImage->Width, texImage->Height, texImage->Depth); @@ -200,7 +200,7 @@ intelTexImage(struct gl_context * ctx, } DBG("%s: upload image %dx%dx%d pixels %p\n", - __FUNCTION__, texImage->Width, texImage->Height, texImage->Depth, + __func__, texImage->Width, texImage->Height, texImage->Depth, pixels); _mesa_store_teximage(ctx, dims, texImage, diff --git a/src/mesa/drivers/dri/i915/intel_tex_subimage.c b/src/mesa/drivers/dri/i915/intel_tex_subimage.c index 2f46c738e89..2e02d50f13f 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/i915/intel_tex_subimage.c @@ -71,7 +71,7 @@ intel_blit_texsubimage(struct gl_context * ctx, return false; DBG("BLT subimage %s target %s level %d offset %d,%d %dx%d\n", - __FUNCTION__, + __func__, _mesa_lookup_enum_by_nr(texImage->TexObject->Target), texImage->Level, xoffset, yoffset, width, height); diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 2c0a78562a0..144f0fc911a 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -798,7 +798,7 @@ intel_fallback_tri(struct intel_context *intel, SWvertex v[3]; if (0) - fprintf(stderr, "\n%s\n", __FUNCTION__); + fprintf(stderr, "\n%s\n", __func__); INTEL_FIREVERTICES(intel); @@ -819,7 +819,7 @@ intel_fallback_line(struct intel_context *intel, SWvertex v[2]; if (0) - fprintf(stderr, "\n%s\n", __FUNCTION__); + fprintf(stderr, "\n%s\n", __func__); INTEL_FIREVERTICES(intel); @@ -838,7 +838,7 @@ intel_fallback_point(struct intel_context *intel, SWvertex v[1]; if (0) - fprintf(stderr, "\n%s\n", __FUNCTION__); + fprintf(stderr, "\n%s\n", __func__); INTEL_FIREVERTICES(intel); @@ -971,7 +971,7 @@ intelChooseRenderState(struct gl_context * ctx) GLuint index = 0; if (INTEL_DEBUG & DEBUG_STATE) - fprintf(stderr, "\n%s\n", __FUNCTION__); + fprintf(stderr, "\n%s\n", __func__); if ((flags & (ANY_FALLBACK_FLAGS | ANY_RASTER_FLAGS)) || have_wpos) { @@ -1133,7 +1133,7 @@ intelRasterPrimitive(struct gl_context * ctx, GLenum rprim, GLuint hwprim) struct intel_context *intel = intel_context(ctx); if (0) - fprintf(stderr, "%s %s %x\n", __FUNCTION__, + fprintf(stderr, "%s %s %x\n", __func__, _mesa_lookup_enum_by_nr(rprim), hwprim); intel->vtbl.reduced_primitive_state(intel, rprim); @@ -1158,7 +1158,7 @@ intelRenderPrimitive(struct gl_context * ctx, GLenum prim) ctx->Polygon.BackMode != GL_FILL); if (0) - fprintf(stderr, "%s %s\n", __FUNCTION__, _mesa_lookup_enum_by_nr(prim)); + fprintf(stderr, "%s %s\n", __func__, _mesa_lookup_enum_by_nr(prim)); /* Let some clipping routines know which primitive they're dealing * with. |