summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian H. Kristensen <hoegsberg@google.com>2020-05-22 15:03:55 -0700
committerEric Engestrom <eric@engestrom.ch>2020-05-27 21:54:16 +0200
commit0931bf60fd708ff2d48f39c78b7c5253c8c28535 (patch)
treef9127f4667641be7f7851a3d5fd40e9916cf6fd6
parentcb5d60b7d972289f21d4d154f09f7bff90effdcd (diff)
freedreno: Use the right amount of &'s
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5176> (cherry picked from commit 5f365affc906ed9b07857a6fafbb5d51f3f1a607)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/freedreno/freedreno_context.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 5c3a399b0a5..5f5b6bae19f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1183,7 +1183,7 @@
"description": "freedreno: Use the right amount of &'s",
"nominated": false,
"nomination_type": null,
- "resolution": 4,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index 529b58e8b54..c9dfa5def6b 100644
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -436,7 +436,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
}
#if DETECT_OS_ANDROID
- if (fd_mesa_debug && FD_DBG_LOG) {
+ if (fd_mesa_debug & FD_DBG_LOG) {
static unsigned idx = 0;
char *p;
asprintf(&p, "/data/fdlog/%s-%d.log", util_get_process_name(), idx++);