X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fradeon%2Fradeon_context.c;h=9db0ea6db3ea34d06d48357cc2de58a33da21bf2;hb=04dc6074cf7f651b720868e0ba24362b585d1b31;hp=26490ea4e04c6fd576d4f2d73a49d91fb765ce9f;hpb=4bea4cb9fd55cdb267003a6e6e16f7e903e00940;p=mesa.git diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 26490ea4e04..9db0ea6db3e 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -31,7 +31,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin * Gareth Hughes - * Keith Whitwell + * Keith Whitwell */ #include @@ -39,10 +39,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/api_arrayelt.h" #include "main/api_exec.h" #include "main/context.h" -#include "main/simple_list.h" +#include "util/simple_list.h" #include "main/imports.h" #include "main/extensions.h" -#include "main/mfeatures.h" #include "main/version.h" #include "main/vtxfmt.h" @@ -68,7 +67,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_fog.h" #include "utils.h" -#include "xmlpool.h" /* for symbolic values of enum-type options */ +#include "util/xmlpool.h" /* for symbolic values of enum-type options */ extern const struct tnl_pipeline_stage _radeon_render_stage; extern const struct tnl_pipeline_stage _radeon_tcl_stage; @@ -93,29 +92,6 @@ static const struct tnl_pipeline_stage *radeon_pipeline[] = { NULL, }; -static void r100_get_lock(radeonContextPtr radeon) -{ - r100ContextPtr rmesa = (r100ContextPtr)radeon; - drm_radeon_sarea_t *sarea = radeon->sarea; - - RADEON_STATECHANGE(rmesa, ctx); - if (rmesa->radeon.sarea->tiling_enabled) { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] |= - RADEON_COLOR_TILE_ENABLE; - } else { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] &= - ~RADEON_COLOR_TILE_ENABLE; - } - - if (sarea->ctx_owner != rmesa->radeon.dri.hwContext) { - sarea->ctx_owner = rmesa->radeon.dri.hwContext; - } -} - -static void r100_vtbl_emit_cs_header(struct radeon_cs *cs, radeonContextPtr rmesa) -{ -} - static void r100_vtbl_pre_emit_state(radeonContextPtr radeon) { r100ContextPtr rmesa = (r100ContextPtr)radeon; @@ -136,7 +112,7 @@ static void r100_emit_query_finish(radeonContextPtr radeon) BATCH_LOCALS(radeon); struct radeon_query_object *query = radeon->query.current; - BEGIN_BATCH_NO_AUTOSTATE(4); + BEGIN_BATCH(4); OUT_BATCH(CP_PACKET0(RADEON_RB3D_ZPASS_ADDR, 0)); OUT_BATCH_RELOC(0, query->bo, query->curr_offset, 0, RADEON_GEM_DOMAIN_GTT, 0); END_BATCH(); @@ -147,9 +123,6 @@ static void r100_emit_query_finish(radeonContextPtr radeon) static void r100_init_vtbl(radeonContextPtr radeon) { - radeon->vtbl.get_lock = r100_get_lock; - radeon->vtbl.update_viewport_offset = radeonUpdateViewportOffset; - radeon->vtbl.emit_cs_header = r100_vtbl_emit_cs_header; radeon->vtbl.swtcl_flush = r100_swtcl_flush; radeon->vtbl.pre_emit_state = r100_vtbl_pre_emit_state; radeon->vtbl.fallback = radeonFallback; @@ -158,6 +131,7 @@ static void r100_init_vtbl(radeonContextPtr radeon) radeon->vtbl.check_blit = r100_check_blit; radeon->vtbl.blit = r100_blit; radeon->vtbl.is_format_renderable = radeonIsFormatRenderable; + radeon->vtbl.revalidate_all_buffers = r100ValidateBuffers; } /* Create the device specific context. @@ -166,9 +140,7 @@ GLboolean r100CreateContext( gl_api api, const struct gl_config *glVisual, __DRIcontext *driContextPriv, - unsigned major_version, - unsigned minor_version, - uint32_t flags, + const struct __DriverContextConfig *ctx_config, unsigned *error, void *sharedContextPrivate) { @@ -180,25 +152,16 @@ r100CreateContext( gl_api api, int i; int tcl_mode, fthrottle_mode; - switch (api) { - case API_OPENGL_COMPAT: - if (major_version > 1 || minor_version > 3) { - *error = __DRI_CTX_ERROR_BAD_VERSION; - return GL_FALSE; - } - break; - case API_OPENGLES: - break; - default: - *error = __DRI_CTX_ERROR_BAD_API; - return GL_FALSE; + if (ctx_config->flags & ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_NO_ERROR)) { + *error = __DRI_CTX_ERROR_UNKNOWN_FLAG; + return false; } - /* Flag filtering is handled in dri2CreateContextAttribs. - */ - (void) flags; + if (ctx_config->attribute_mask) { + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; + return false; + } - assert(glVisual); assert(driContextPriv); assert(screen); @@ -214,35 +177,28 @@ r100CreateContext( gl_api api, /* init exp fog table data */ radeonInitStaticFogData(); - + /* Parse configuration files. * Do this here so that initialMaxAnisotropy is set before we create * the default textures. */ driParseConfigFiles (&rmesa->radeon.optionCache, &screen->optionCache, - screen->driScreen->myNum, "radeon"); + screen->driScreen->myNum, "radeon", NULL, NULL, 0); rmesa->radeon.initialMaxAnisotropy = driQueryOptionf(&rmesa->radeon.optionCache, "def_max_anisotropy"); - if ( driQueryOptionb( &rmesa->radeon.optionCache, "hyperz" ) ) { - if ( sPriv->drm_version.minor < 13 ) - fprintf( stderr, "DRM version 1.%d too old to support HyperZ, " - "disabling.\n", sPriv->drm_version.minor ); - else - rmesa->using_hyperz = GL_TRUE; - } - - if ( sPriv->drm_version.minor >= 15 ) - rmesa->texmicrotile = GL_TRUE; + if (driQueryOptionb(&rmesa->radeon.optionCache, "hyperz")) + rmesa->using_hyperz = GL_TRUE; /* Init default driver functions then plug in our Radeon-specific functions * (the texture functions are especially important) */ _mesa_init_driver_functions( &functions ); + _tnl_init_driver_draw_function( &functions ); radeonInitTextureFuncs( &rmesa->radeon, &functions ); radeonInitQueryObjFunctions(&functions); - if (!radeonInitContext(&rmesa->radeon, &functions, + if (!radeonInitContext(&rmesa->radeon, api, &functions, glVisual, driContextPriv, sharedContextPrivate)) { free(rmesa); @@ -254,33 +210,27 @@ r100CreateContext( gl_api api, rmesa->radeon.hw.all_dirty = GL_TRUE; ctx = &rmesa->radeon.glCtx; + + driContextSetFlags(ctx, ctx_config->flags); + /* Initialize the software rasterizer and helper modules. */ _swrast_CreateContext( ctx ); _vbo_CreateContext( ctx ); _tnl_CreateContext( ctx ); _swsetup_CreateContext( ctx ); - _ae_create_context( ctx ); - - /* Set the maximum texture size small enough that we can guarentee that - * all texture units can bind a maximal texture and have all of them in - * texturable memory at once. Depending on the allow_large_textures driconf - * setting allow larger textures. - */ ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, "texture_units"); - ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; + ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.StripTextureBorder = GL_TRUE; - i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures"); - /* FIXME: When no memory manager is available we should set this * to some reasonable value based on texture memory pool size */ - ctx->Const.MaxTextureLevels = 12; + ctx->Const.MaxTextureSize = 2048; ctx->Const.Max3DTextureLevels = 9; ctx->Const.MaxCubeTextureLevels = 12; ctx->Const.MaxTextureRectSize = 2048; @@ -315,7 +265,7 @@ r100CreateContext( gl_api api, ctx->Const.MaxColorAttachments = 1; ctx->Const.MaxRenderbufferSize = 2048; - _mesa_set_mvp_with_dp4( ctx, GL_TRUE ); + ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = true; /* Install the customized pipeline: */ @@ -341,34 +291,25 @@ r100CreateContext( gl_api api, _math_matrix_set_identity( &rmesa->tmpmat[i] ); } + ctx->Extensions.ARB_occlusion_query = true; ctx->Extensions.ARB_texture_border_clamp = true; + ctx->Extensions.ARB_texture_cube_map = true; ctx->Extensions.ARB_texture_env_combine = true; ctx->Extensions.ARB_texture_env_crossbar = true; ctx->Extensions.ARB_texture_env_dot3 = true; - ctx->Extensions.EXT_fog_coord = true; - ctx->Extensions.EXT_packed_depth_stencil = true; - ctx->Extensions.EXT_secondary_color = true; + ctx->Extensions.ARB_texture_filter_anisotropic = true; + ctx->Extensions.ARB_texture_mirror_clamp_to_edge = true; + ctx->Extensions.ATI_texture_env_combine3 = true; + ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.EXT_texture_env_dot3 = true; ctx->Extensions.EXT_texture_filter_anisotropic = true; ctx->Extensions.EXT_texture_mirror_clamp = true; - ctx->Extensions.ATI_texture_env_combine3 = true; - ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.MESA_ycbcr_texture = true; - ctx->Extensions.NV_blend_square = true; + ctx->Extensions.NV_texture_rectangle = true; ctx->Extensions.OES_EGL_image = true; - ctx->Extensions.EXT_framebuffer_object = true; - ctx->Extensions.ARB_texture_cube_map = true; - if (rmesa->radeon.glCtx.Mesa_DXTn) { - ctx->Extensions.EXT_texture_compression_s3tc = true; - ctx->Extensions.S3_s3tc = true; - } - else if (driQueryOptionb (&rmesa->radeon.optionCache, "force_s3tc_enable")) { - ctx->Extensions.EXT_texture_compression_s3tc = true; - } - - ctx->Extensions.NV_texture_rectangle = true; - ctx->Extensions.ARB_occlusion_query = true; + ctx->Extensions.EXT_texture_compression_s3tc = true; + ctx->Extensions.ANGLE_texture_compression_dxt = true; /* XXX these should really go right after _mesa_init_driver_functions() */ radeon_fbo_init(&rmesa->radeon); @@ -389,14 +330,8 @@ r100CreateContext( gl_api api, rmesa->radeon.do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS); - -#if DO_DEBUG - RADEON_DEBUG = driParseDebugString( getenv( "RADEON_DEBUG" ), - debug_control ); -#endif - tcl_mode = driQueryOptioni(&rmesa->radeon.optionCache, "tcl_mode"); - if (driQueryOptionb(&rmesa->radeon.optionCache, "no_rast")) { + if (getenv("RADEON_NO_RAST")) { fprintf(stderr, "disabling 3D acceleration\n"); FALLBACK(rmesa, RADEON_FALLBACK_DISABLE, 1); } else if (tcl_mode == DRI_CONF_TCL_SW || @@ -412,10 +347,11 @@ r100CreateContext( gl_api api, /* _tnl_need_dlist_norm_lengths( ctx, GL_FALSE ); */ } + _mesa_override_extensions(ctx); _mesa_compute_version(ctx); /* Exec table initialization requires the version to be computed */ - _mesa_initialize_exec_table(ctx); + _mesa_initialize_dispatch_tables(ctx); _mesa_initialize_vbo_vtxfmt(ctx); *error = __DRI_CTX_ERROR_SUCCESS;