mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 622585 - Use Clamp instead of Wrap texture sampling in D3D10 layers. r=Bas a=blocking2.0

This commit is contained in:
Matt Woodrow 2011-02-16 16:19:45 +13:00
Родитель 472b5c6e44
Коммит 1163104b11
2 изменённых файлов: 16 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
gfx/layers/d3d10/LayerManagerD3D10.fx
Просмотреть файл

@ -69,15 +69,15 @@ Texture2D tRGBWhite;
SamplerState LayerTextureSamplerLinear SamplerState LayerTextureSamplerLinear
{ {
Filter = MIN_MAG_MIP_LINEAR; Filter = MIN_MAG_MIP_LINEAR;
AddressU = Wrap; AddressU = Clamp;
AddressV = Wrap; AddressV = Clamp;
}; };
SamplerState LayerTextureSamplerPoint SamplerState LayerTextureSamplerPoint
{ {
Filter = MIN_MAG_MIP_POINT; Filter = MIN_MAG_MIP_POINT;
AddressU = Wrap; AddressU = Clamp;
AddressV = Wrap; AddressV = Clamp;
}; };
struct VS_INPUT { struct VS_INPUT {

24
gfx/layers/d3d10/LayerManagerD3D10Effect.h
Просмотреть файл

@ -76,14 +76,14 @@ Texture2D tRGBWhite;
SamplerState LayerTextureSamplerLinear SamplerState LayerTextureSamplerLinear
{ {
Filter = uint(MIN_MAG_MIP_LINEAR /* 21 */); Filter = uint(MIN_MAG_MIP_LINEAR /* 21 */);
AddressU = uint(WRAP /* 1 */); AddressU = uint(CLAMP /* 3 */);
AddressV = uint(WRAP /* 1 */); AddressV = uint(CLAMP /* 3 */);
}; };
SamplerState LayerTextureSamplerPoint SamplerState LayerTextureSamplerPoint
{ {
Filter = uint(MIN_MAG_MIP_POINT /* 0 */); Filter = uint(MIN_MAG_MIP_POINT /* 0 */);
AddressU = uint(WRAP /* 1 */); AddressU = uint(CLAMP /* 3 */);
AddressV = uint(WRAP /* 1 */); AddressV = uint(CLAMP /* 3 */);
}; };
// //
@ -2017,10 +2017,10 @@ technique10 RenderSolidColorLayer
const BYTE g_main[] = const BYTE g_main[] =
{ {
68, 88, 66, 67, 115, 243, 68, 88, 66, 67, 105, 120,
93, 75, 60, 125, 157, 33, 157, 39, 125, 94, 29, 78,
111, 128, 156, 20, 14, 161, 15, 169, 65, 191, 70, 115,
216, 147, 1, 0, 0, 0, 164, 88, 1, 0, 0, 0,
231, 121, 0, 0, 1, 0, 231, 121, 0, 0, 1, 0,
0, 0, 36, 0, 0, 0, 0, 0, 36, 0, 0, 0,
70, 88, 49, 48, 187, 121, 70, 88, 49, 48, 187, 121,
@ -2184,9 +2184,9 @@ const BYTE g_main[] =
0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0,
0, 21, 0, 0, 0, 1, 0, 21, 0, 0, 0, 1,
0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0,
0, 1, 0, 0, 0, 1, 0, 3, 0, 0, 0, 1,
0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0,
0, 1, 0, 0, 0, 76, 0, 3, 0, 0, 0, 76,
97, 121, 101, 114, 84, 101, 97, 121, 101, 114, 84, 101,
120, 116, 117, 114, 101, 83, 120, 116, 117, 114, 101, 83,
97, 109, 112, 108, 101, 114, 97, 109, 112, 108, 101, 114,
@ -2194,9 +2194,9 @@ const BYTE g_main[] =
1, 0, 0, 0, 2, 0, 1, 0, 0, 0, 2, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 2, 0, 1, 0, 0, 0, 2, 0,
0, 0, 1, 0, 0, 0, 0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 2, 0, 1, 0, 0, 0, 2, 0,
0, 0, 1, 0, 0, 0, 0, 0, 3, 0, 0, 0,
82, 101, 110, 100, 101, 114, 82, 101, 110, 100, 101, 114,
82, 71, 66, 76, 97, 121, 82, 71, 66, 76, 97, 121,
101, 114, 80, 114, 101, 109, 101, 114, 80, 114, 101, 109,