From a0dad83029aa98cfc2c90620360e05d86e1de706 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Sun, 2 Sep 2018 13:49:53 -0700 Subject: [PATCH] nv2a: Replace QINC/DECREF macros with new inlines --- hw/xbox/nv2a/nv2a_psh.c | 60 ++++++++++++++++++------------------- hw/xbox/nv2a/nv2a_shaders.c | 8 ++--- hw/xbox/nv2a/nv2a_vsh.c | 16 +++++----- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/hw/xbox/nv2a/nv2a_psh.c b/hw/xbox/nv2a/nv2a_psh.c index e31533d1b1..1e227d2bda 100644 --- a/hw/xbox/nv2a/nv2a_psh.c +++ b/hw/xbox/nv2a/nv2a_psh.c @@ -338,7 +338,7 @@ static QString* get_input_var(struct PixelShader *ps, struct InputInfo in, bool switch (in.mod) { case PS_INPUTMAPPING_SIGNED_IDENTITY: case PS_INPUTMAPPING_UNSIGNED_IDENTITY: - QINCREF(reg); + qobject_ref(reg); res = reg; break; case PS_INPUTMAPPING_UNSIGNED_INVERT: @@ -364,7 +364,7 @@ static QString* get_input_var(struct PixelShader *ps, struct InputInfo in, bool break; } - QDECREF(reg); + qobject_unref(reg); return res; } @@ -374,7 +374,7 @@ static QString* get_output(QString *reg, int mapping) QString *res; switch (mapping) { case PS_COMBINEROUTPUT_IDENTITY: - QINCREF(reg); + qobject_ref(reg); res = reg; break; case PS_COMBINEROUTPUT_BIAS: @@ -442,8 +442,8 @@ static void add_stage_code(struct PixelShader *ps, qstring_append_fmt(ps->code, "%s.%s = %s(%s);\n", qstring_get_str(ab_dest), write_mask, caster, qstring_get_str(ab_mapping)); } else { - QDECREF(ab_dest); - QINCREF(ab_mapping); + qobject_unref(ab_dest); + qobject_ref(ab_mapping); ab_dest = ab_mapping; } @@ -451,8 +451,8 @@ static void add_stage_code(struct PixelShader *ps, qstring_append_fmt(ps->code, "%s.%s = %s(%s);\n", qstring_get_str(cd_dest), write_mask, caster, qstring_get_str(cd_mapping)); } else { - QDECREF(cd_dest); - QINCREF(cd_mapping); + qobject_unref(cd_dest); + qobject_ref(cd_mapping); cd_dest = cd_mapping; } @@ -479,19 +479,19 @@ static void add_stage_code(struct PixelShader *ps, qstring_get_str(sum_dest), write_mask, caster, qstring_get_str(sum_mapping)); } - QDECREF(a); - QDECREF(b); - QDECREF(c); - QDECREF(d); - QDECREF(ab); - QDECREF(cd); - QDECREF(ab_mapping); - QDECREF(cd_mapping); - QDECREF(ab_dest); - QDECREF(cd_dest); - QDECREF(sum_dest); - QDECREF(sum); - QDECREF(sum_mapping); + qobject_unref(a); + qobject_unref(b); + qobject_unref(c); + qobject_unref(d); + qobject_unref(ab); + qobject_unref(cd); + qobject_unref(ab_mapping); + qobject_unref(cd_mapping); + qobject_unref(ab_dest); + qobject_unref(cd_dest); + qobject_unref(sum_dest); + qobject_unref(sum); + qobject_unref(sum_mapping); } // Add code for the final combiner stage @@ -513,14 +513,14 @@ static void add_final_stage_code(struct PixelShader *ps, struct FCInputInfo fina /* FIXME: Is .x correctly here? */ qstring_append_fmt(ps->code, "r0.a = vec3(%s).x;\n", qstring_get_str(g)); - QDECREF(a); - QDECREF(b); - QDECREF(c); - QDECREF(d); - QDECREF(g); + qobject_unref(a); + qobject_unref(b); + qobject_unref(c); + qobject_unref(d); + qobject_unref(g); - QDECREF(ps->varE); - QDECREF(ps->varF); + qobject_unref(ps->varE); + qobject_unref(ps->varF); ps->varE = ps->varF = NULL; } @@ -788,9 +788,9 @@ static QString* psh_convert(struct PixelShader *ps) qstring_append(final, "fragColor = r0;\n"); qstring_append(final, "}\n"); - QDECREF(preflight); - QDECREF(vars); - QDECREF(ps->code); + qobject_unref(preflight); + qobject_unref(vars); + qobject_unref(ps->code); return final; } diff --git a/hw/xbox/nv2a/nv2a_shaders.c b/hw/xbox/nv2a/nv2a_shaders.c index e0e4f26466..98fcb89989 100644 --- a/hw/xbox/nv2a/nv2a_shaders.c +++ b/hw/xbox/nv2a/nv2a_shaders.c @@ -792,7 +792,7 @@ STRUCT_VERTEX_DATA); /* Return combined header + source */ qstring_append(header, qstring_get_str(body)); - QDECREF(body); + qobject_unref(body); return header; } @@ -857,7 +857,7 @@ ShaderBinding* generate_shaders(const ShaderState state) "geometry shader"); glAttachShader(program, geometry_shader); - QDECREF(geometry_shader_code); + qobject_unref(geometry_shader_code); vtx_prefix = 'v'; } else { @@ -871,7 +871,7 @@ ShaderBinding* generate_shaders(const ShaderState state) qstring_get_str(vertex_shader_code), "vertex shader"); glAttachShader(program, vertex_shader); - QDECREF(vertex_shader_code); + qobject_unref(vertex_shader_code); /* Bind attributes for vertices */ @@ -892,7 +892,7 @@ ShaderBinding* generate_shaders(const ShaderState state) "fragment shader"); glAttachShader(program, fragment_shader); - QDECREF(fragment_shader_code); + qobject_unref(fragment_shader_code); /* link the program */ diff --git a/hw/xbox/nv2a/nv2a_vsh.c b/hw/xbox/nv2a/nv2a_vsh.c index 97ccb58101..780e46321a 100644 --- a/hw/xbox/nv2a/nv2a_vsh.c +++ b/hw/xbox/nv2a/nv2a_vsh.c @@ -375,7 +375,7 @@ static QString* decode_opcode_input(const uint32_t *shader_token, /* swizzle bits are next to the neg bit */ QString *swizzle_str = decode_swizzle(shader_token, neg_field+1); qstring_append(ret_str, qstring_get_str(swizzle_str)); - QDECREF(swizzle_str); + qobject_unref(swizzle_str); } return ret_str; @@ -465,7 +465,7 @@ static QString* decode_token(const uint32_t *shader_token) vsh_get_field(shader_token, FLD_A_R)); qstring_append(inputs_mac, ", "); qstring_append(inputs_mac, qstring_get_str(input_a)); - QDECREF(input_a); + qobject_unref(input_a); } if (mac_opcode_params[mac].B) { QString *input_b = @@ -475,7 +475,7 @@ static QString* decode_token(const uint32_t *shader_token) vsh_get_field(shader_token, FLD_B_R)); qstring_append(inputs_mac, ", "); qstring_append(inputs_mac, qstring_get_str(input_b)); - QDECREF(input_b); + qobject_unref(input_b); } if (mac_opcode_params[mac].C) { qstring_append(inputs_mac, ", "); @@ -488,7 +488,7 @@ static QString* decode_token(const uint32_t *shader_token) vsh_get_field(shader_token, FLD_OUT_MAC_MASK), mac_opcode[mac], qstring_get_str(inputs_mac)); - QDECREF(inputs_mac); + qobject_unref(inputs_mac); } else { ret = qstring_new(); } @@ -509,11 +509,11 @@ static QString* decode_token(const uint32_t *shader_token) qstring_append(ret, qstring_get_str(ilu_op)); - QDECREF(inputs_c); - QDECREF(ilu_op); + qobject_unref(inputs_c); + qobject_unref(ilu_op); } - QDECREF(input_c); + qobject_unref(input_c); return ret; } @@ -722,7 +722,7 @@ void vsh_translate(uint16_t version, qstring_append(body, "\n"); qstring_append(body, qstring_get_str(token_str)); qstring_append(body, "\n"); - QDECREF(token_str); + qobject_unref(token_str); if (vsh_get_field(cur_token, FLD_FINAL)) { has_final = true;