Enable Option "Legacy3D" for 965 as well, and clarify both the docs and code.
Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
28bb056f8c
commit
55cb65c6fd
|
|
@ -135,27 +135,12 @@ Disable or enable XVideo support.
|
|||
Default: XVideo is enabled for configurations where it is supported.
|
||||
.TP
|
||||
.BI "Option \*qLegacy3D\*q \*q" boolean \*q
|
||||
Enable support for the legacy i915_dri.so 3D driver.
|
||||
This will, among other things, make the 2D driver tell libGL to
|
||||
load the 3D driver i915_dri.so instead of the newer i915tex_dri.so.
|
||||
This option is only used for chipsets in the range i830-i945.
|
||||
Default for i830-i945 series: Enabled.
|
||||
Default for i810: The option is not used.
|
||||
Default for i965: The option is always true.
|
||||
.TP
|
||||
.BI "Option \*qAperTexSize\*q \*q" integer \*q
|
||||
Give the size in kiB of the AGP aperture area that is reserved for the
|
||||
DRM memory manager present in i915 drm from version 1.7.0 and upwards,
|
||||
and that is used with the 3D driver in Mesa from version 6.5.2 and
|
||||
upwards. If the size is set too high to make room for pre-allocated
|
||||
VideoRam, the driver will try to reduce it automatically. If you use only
|
||||
older Mesa or DRM versions, you may set this value to zero, and
|
||||
activate the legacy texture pool (see
|
||||
.B "Option \*qLegacy3D\*q"
|
||||
). If you run 3D programs with large texture memory requirements, you might
|
||||
gain some performance by increasing this value.
|
||||
Default: 32768.
|
||||
.TP
|
||||
Enable support for the non-GEM mode of the 3D driver on i830 and newer.
|
||||
This will allocate a large static area for older Mesa to use for its texture
|
||||
pool. On systems with a working GEM environment, this can be disabled to
|
||||
increase the memory pool available to other graphics tasks.
|
||||
Default for i830 and newer: Enabled.
|
||||
Default for i810: this option is not used.
|
||||
.BI "Option \*qPageFlip\*q \*q" boolean \*q
|
||||
Enable support for page flipping. This should improve 3D performance at the
|
||||
potential cost of worse performance with mixed 2D/3D. Also note that this gives
|
||||
|
|
|
|||
|
|
@ -306,9 +306,7 @@ typedef enum {
|
|||
OPTION_LVDS24BITMODE,
|
||||
OPTION_FBC,
|
||||
OPTION_TILING,
|
||||
#ifdef XF86DRI
|
||||
OPTION_INTELTEXPOOL,
|
||||
#endif
|
||||
OPTION_LEGACY3D,
|
||||
OPTION_LVDSFIXEDMODE,
|
||||
OPTION_TRIPLEBUFFER,
|
||||
OPTION_FORCEENABLEPIPEA,
|
||||
|
|
@ -334,7 +332,7 @@ static OptionInfoRec I830Options[] = {
|
|||
{OPTION_FBC, "FramebufferCompression", OPTV_BOOLEAN, {0}, TRUE},
|
||||
{OPTION_TILING, "Tiling", OPTV_BOOLEAN, {0}, TRUE},
|
||||
#ifdef XF86DRI
|
||||
{OPTION_INTELTEXPOOL,"Legacy3D", OPTV_BOOLEAN, {0}, FALSE},
|
||||
{OPTION_LEGACY3D, "Legacy3D", OPTV_BOOLEAN, {0}, FALSE},
|
||||
#endif
|
||||
{OPTION_LVDSFIXEDMODE, "LVDSFixedMode", OPTV_BOOLEAN, {0}, FALSE},
|
||||
{OPTION_TRIPLEBUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, FALSE},
|
||||
|
|
@ -1567,22 +1565,8 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
|
|||
}
|
||||
|
||||
if (!pI830->directRenderingDisabled) {
|
||||
pI830->allocate_classic_textures = TRUE;
|
||||
|
||||
from = X_PROBED;
|
||||
|
||||
#ifdef XF86DRI_MM
|
||||
if (!IS_I965G(pI830)) {
|
||||
Bool tmp;
|
||||
|
||||
if (xf86GetOptValBool(pI830->Options,
|
||||
OPTION_INTELTEXPOOL, &tmp)) {
|
||||
from = X_CONFIG;
|
||||
if (!tmp)
|
||||
pI830->allocate_classic_textures = FALSE;
|
||||
}
|
||||
}
|
||||
#endif /* XF86DRI_MM */
|
||||
pI830->allocate_classic_textures =
|
||||
xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
|
||||
}
|
||||
}
|
||||
#endif /* XF86DRI */
|
||||
|
|
|
|||
Loading…
Reference in New Issue