From 2dabff9068a86a070615df587e4e9327b1d1ca6e Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Sat, 14 Nov 2015 12:21:21 +0100 Subject: i965: Move brw_query_samples_for_format() to brw_queryformat.c Now that there is a dedicated source file for internal format queries, this function belongs there. Reviewed-by: Dave Airlie --- src/mesa/drivers/dri/i965/brw_context.c | 38 ---------------------------- src/mesa/drivers/dri/i965/brw_context.h | 2 ++ src/mesa/drivers/dri/i965/brw_formatquery.c | 39 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index a6567f827b1..c16da0d2291 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -75,44 +75,6 @@ * Mesa's Driver Functions ***************************************/ -static size_t -brw_query_samples_for_format(struct gl_context *ctx, GLenum target, - GLenum internalFormat, int samples[16]) -{ - struct brw_context *brw = brw_context(ctx); - - (void) target; - - switch (brw->gen) { - case 9: - samples[0] = 16; - samples[1] = 8; - samples[2] = 4; - samples[3] = 2; - return 4; - - case 8: - samples[0] = 8; - samples[1] = 4; - samples[2] = 2; - return 3; - - case 7: - samples[0] = 8; - samples[1] = 4; - return 2; - - case 6: - samples[0] = 4; - return 1; - - default: - assert(brw->gen < 6); - samples[0] = 1; - return 1; - } -} - const char *const brw_vendor_string = "Intel Open Source Technology Center"; const char * diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 88f0d49a5ff..8fca80b617c 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1876,6 +1876,8 @@ void gen7_emit_vs_workaround_flush(struct brw_context *brw); void gen7_emit_cs_stall_flush(struct brw_context *brw); /* brw_queryformat.c */ +size_t brw_query_samples_for_format(struct gl_context *ctx, GLenum target, + GLenum internalFormat, int samples[16]); void brw_query_internal_format(struct gl_context *ctx, GLenum target, GLenum internalFormat, GLenum pname, GLint *params); diff --git a/src/mesa/drivers/dri/i965/brw_formatquery.c b/src/mesa/drivers/dri/i965/brw_formatquery.c index ad59f03e576..5ee1d69dae2 100644 --- a/src/mesa/drivers/dri/i965/brw_formatquery.c +++ b/src/mesa/drivers/dri/i965/brw_formatquery.c @@ -24,6 +24,45 @@ #include "brw_context.h" #include "main/formatquery.h" +size_t +brw_query_samples_for_format(struct gl_context *ctx, GLenum target, + GLenum internalFormat, int samples[16]) +{ + struct brw_context *brw = brw_context(ctx); + + (void) target; + (void) internalFormat; + + switch (brw->gen) { + case 9: + samples[0] = 16; + samples[1] = 8; + samples[2] = 4; + samples[3] = 2; + return 4; + + case 8: + samples[0] = 8; + samples[1] = 4; + samples[2] = 2; + return 3; + + case 7: + samples[0] = 8; + samples[1] = 4; + return 2; + + case 6: + samples[0] = 4; + return 1; + + default: + assert(brw->gen < 6); + samples[0] = 1; + return 1; + } +} + void brw_query_internal_format(struct gl_context *ctx, GLenum target, GLenum internalFormat, GLenum pname, GLint *params) -- cgit v1.2.3