|
5016f8e4
|
2013-02-28T23:20:57
|
|
Removed lod level subtraction since TextureStorage::levelCount already subtracts the lod level.
TRAC #13332
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1973 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
e2e9798b
|
2013-02-28T23:18:50
|
|
Only discard the storage texture when there is a mismatch with its mipmap chain.
TRAC #20587
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1954 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
bdf2d80f
|
2013-02-28T23:16:20
|
|
Add precompiled header support for the libGLESv2 project.
TRAC #22518
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1938 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
486d9e9b
|
2013-02-28T23:15:41
|
|
Remove a lot of unnecessary include files and break include chains.
This should speed up incremental compile times when modifying headers, by reducing the number of dependencies.
TRAC #22518
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1937 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
8a406684
|
2013-02-28T23:15:26
|
|
Don't discard texture storage when redefining and image to generate mip maps.
TRAC #22632
Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1935 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
6bb4886c
|
2013-02-28T23:09:34
|
|
Fix the conversion of textures to rendertargets to use the right number of mip levels if we already initialized storage.
When a texture was initialized with glStorage2DEXT or similar, the conversion to RT could change the number of mips.
TRAC #22560
Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1894 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
779aa261
|
2013-02-28T23:04:58
|
|
Enclose error(GLint) and error(EGLint) into gl and egl namespaces.
This should generate a compile time error if we try to call the wrong function.
TRAC #22411
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1856 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
29c36410
|
2013-01-25T21:53:40
|
|
Fix assert error triggered in D3D11 path when we redefine textures to GL_NONE.
Instead internally convert them between GL_NONE and DXGI_FORMAT_UNKNOWN.
TRAC #22463
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1769 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
664916b7
|
2013-01-25T21:50:32
|
|
Renderer::copyImage now uses the ANGLE rectangle structure instead of the windows one.
TRAC #22358
Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1747 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
4d036457
|
2013-01-11T21:16:22
|
|
Remove all possible libEGL includes from libGLESv2
Trac #22394
Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1715 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
3c17ba65
|
2013-01-11T04:11:41
|
|
Removed the dirty parameters flag from Texture.
TRAC #22248
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1699 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
d8353dd8
|
2012-12-20T21:11:14
|
|
Removes extraneous D3D9-ims in TextureStorage code.
TRAC #22300
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1615 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
87705f82
|
2012-12-20T21:10:45
|
|
Renames classes in the TextureStorage heirarchy for clarity
TRAC #22300
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1613 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
34da397e
|
2012-12-20T21:10:29
|
|
Moves TextureStorage class to TextureStorage9, mostly.
TRAC #22300
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1612 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
4ba24067
|
2012-12-20T20:54:24
|
|
Migrate Image to Image9 and add an abstract base
TRAC #22254
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1572 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
f721fdbd
|
2012-12-20T20:53:11
|
|
Moves GenerateMipmap function to the Renderer
TRAC #22254
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1571 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
c5c806d3
|
2012-12-20T20:52:53
|
|
Passes a base-class Renderer pointer to Image where needed, instead of Renderer9
TRAC #22254
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1570 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
244e1838
|
2012-12-20T20:52:35
|
|
Adds a function to the Renderer which will return a newly created Image.
TRAC #22254
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1569 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
d9ec9022
|
2012-12-20T20:52:16
|
|
Changes the Image array contained in Texture classes to an array of Image pointers.
TRAC #22254
Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1568 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
d186dc7f
|
2012-11-28T19:40:16
|
|
Pass the RenderTarget, not the D3D surface, up the Renderbuffer heirarchy.
TRAC #22094
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1449 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
a27e05ba
|
2012-11-28T19:39:42
|
|
Split the swap chain into an abstract interface and a D3D9 implementation.
TRAC #21926
Signed-off-by: Daniel Koch
Signed-off-by: Geoff Lang
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1445 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
31b13e1f
|
2012-11-28T19:34:30
|
|
Moves Image & Renderer into rx namespace
TRAC #22002
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1414 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
de8a7fff
|
2012-11-28T19:34:13
|
|
Moves the Blitter into the Renderer's domain
TRAC #22001
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1413 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
1d80eeec
|
2012-11-28T19:33:31
|
|
Moves copyToRenderTarget to Renderer
TRAC #22000
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1409 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
ea32d48b
|
2012-11-28T19:33:18
|
|
Removes getDisplay and getContext calls
TRAC #22000
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1408 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
a9571686
|
2012-11-28T19:33:08
|
|
Moves ConvertTextureInternalFormat to the Renderer
TRAC #22000
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1407 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
70062c98
|
2012-11-28T19:32:30
|
|
Passes the Renderer to various objects at construction time.
TRAC #22000
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1406 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
370482e7
|
2012-11-28T19:32:13
|
|
Pass the Renderer to the ResourceManager at construction time.
TRAC #22000
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1404 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
76d3e6e0
|
2012-10-31T19:55:33
|
|
Rename renderer namespace to rx
Trac #21999
Author: Shannon Woods
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1379 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
3cef5391
|
2012-10-31T19:52:15
|
|
Alters the blitter's copy function so that you can pass a framebuffer to it directly.
TRAC #21910
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1375 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
0ad830bf
|
2012-10-31T19:52:12
|
|
Moves mipmap generation to texture storage and image objects.
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1374 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
690d8aea
|
2012-10-31T19:52:08
|
|
Moves copyToRenderTarget operation into texture storage object.
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1373 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
9d4346f0
|
2012-10-31T19:52:04
|
|
Eliminates getD3DTexture, instead returning the texture storage object.
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1372 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
0f195ada
|
2012-10-31T19:51:59
|
|
Passes texture storage object to image directly to update its surfaces
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1371 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
25ee7441
|
2012-10-31T19:51:56
|
|
Passes the swapchain to texture storage constructor instead of d3d texture.
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1370 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
f032cb88
|
2012-10-31T19:51:52
|
|
Initializes storage from GL params instead of D3D params
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1369 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
df14c761
|
2012-10-31T19:51:48
|
|
Moves static d3d texture format conversion utilities to TextureStorage.
TRAC #21910
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1368 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
20d36667
|
2012-10-31T19:51:43
|
|
Mostly eliminates usage of getD3DFormat in Texture.
TRAC #21906
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1367 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
b5e1a272
|
2012-10-31T19:10:00
|
|
Moves TextureStorage class to its own file in the Renderer directory
TRAC #21909
Author: Shannon Woods
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1363 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
b9d7e6f8
|
2012-10-31T19:08:32
|
|
Moves Image class to its own file in the Renderer's directory.
TRAC #21909
Author: Shannon Woods
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1362 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
4b2fffb8
|
2012-10-31T19:08:29
|
|
Fix minor spacing issue blocking merge
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1361 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2507f41e
|
2012-10-31T18:46:48
|
|
Split Renderer into version independent interface and Renderer9 implementation.
TRAC #21963
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1358 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
3c72078a
|
2012-10-31T18:42:34
|
|
Add renderer::SwapChain class and move functionality from egl::Surface
Trac #21810
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1351 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
106e1f7b
|
2012-10-31T18:38:36
|
|
Removes D3D types from the Config class
TRAC #21819
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1347 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
64e6290e
|
2012-10-31T18:27:46
|
|
Fix merge compilation errors
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1338 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
a734f27c
|
2012-10-31T18:07:48
|
|
Move SetTexture calls to the renderer class
Trac #21727
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1337 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
ebf139fe
|
2012-10-31T18:07:32
|
|
Move texture sampler state into a separate sampler state structure.
Trac #21727
Conflicts:
src/libGLESv2/Texture.cpp
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1335 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
f112217a
|
2012-10-31T18:07:20
|
|
Eliminate use of global getDevice() function.
Trac #21727
Everything must go through the renderer.
Conflicts:
src/libGLESv2/Texture.cpp
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1334 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
621ce053
|
2012-10-31T17:52:29
|
|
Add Renderer class and move functionality from Display
Trac #21727
Conflicts:
src/libGLESv2/Texture.cpp
src/libGLESv2/libGLESv2.vcxproj
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1329 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
ca9a3c87
|
2012-10-26T18:55:07
|
|
Avoids uploading levels other than 0 for incomplete textures.
TRAC #21815
Fixes compressed texture test assertion in WebGL top-of-tree conformance suite when running with debug build
Signed-off-by: Daniel Koch
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1323 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
a841b11d
|
2012-10-17T18:30:14
|
|
Only replace image surfaces with equal-sized managed surfaces.
TRAC #21621
Issue=311
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1314 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
853b577f
|
2012-10-17T18:30:10
|
|
Fixed support for updating from managed surfaces.
TRAC #21621
Issue=311
Signed-off-by: Daniel Koch
Author: Nicolas Capens
(Fixes XP path that was broken in r1308)
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1313 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2e38b800
|
2012-10-17T18:30:06
|
|
Eliminated D3DXLoadSurfaceFromSurface from glGenerateMipmaps.
TRAC #21621
Issue=311
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1312 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
8ea6942a
|
2012-10-17T18:30:03
|
|
Eliminated D3DXLoadSurfaceFromSurface from Image::copy.
TRAC #21621
Issue=311
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1311 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
dabf0027
|
2012-10-17T18:29:59
|
|
Eliminated D3DXLoadSurfaceFromSurface from copyToRenderTarget.
TRAC #21621
Issue=311
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1310 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
4bb04bef
|
2012-10-17T18:29:55
|
|
Eliminate D3DXLoadSurfaceFromSurface from setManagedSurface.
TRAC #21621
Issue=311
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1309 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
e0adbd80
|
2012-10-17T18:29:52
|
|
Removed an unreachable path in texture loading code
TRAC #21621
Issue=311
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1308 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
5127803f
|
2012-10-17T18:22:51
|
|
Don't promote packed RGB textures to RGBA d3d surfaces.
TRAC #21591
Issue=362
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1305 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
6b1a0a0c
|
2012-10-17T18:22:47
|
|
Some cleanup after the previous sized internal format patches
TRAC #21609
Signed-off-by: Daniel Koch
Author: Shannon Woods
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1304 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
6452adf7
|
2012-10-17T18:22:35
|
|
Tracks sized internal formats for textures.
TRAC #21609
Signed-off-by: Daniel Koch
Author: Shannon Woods <shannon.woods@transgaming.com>
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1301 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2b5af7b9
|
2012-09-27T17:46:15
|
|
Optimized adding dirty rectangles.
TRAC #21588
Issue=353
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1288 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
1ee986b8
|
2012-09-27T17:46:12
|
|
Make sure the driver knows the texture is dirty when only lower level mipmaps are updated.
TRAC #21588
Issue=353
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1287 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
ce1189b0
|
2012-09-18T20:06:35
|
|
Fix bug 368: Specify the Levels parameter of CreateCubeTexture and CreateTexture correctly.
This fixes ATS test cases 38840,38841 (while making sure that 44095, 44096, 44097, 44100, 44101, 44102 still work)
The Direct3D spec for the 'Levels' parameter of IDirect3DDevice9::CreateCubeTexture (and IDirect3DDevice9::CreateTexture) says: "If this is zero, Direct3D will generate all cube texture sublevels down to 1x1 pixels for each face for hardware that supports mipmapped cube textures."
The 'levels' parameter can be 0 (which means "generate all texture sublevels") or a non-zero value for the actual number of levels to create (often 1 if mapmapping is disabled).
But 1x1 and 2x2 mipmapped textures are not supported, so textures with these dimensions will actually create a 4x4 texture, and set mLodOffset to 2 or 1 respectively so that the level index can be offset as appropriate.
There is only one special case (for textures with dimensions smaller than 4): when levels=1 and the texture is 2x2, it is unnecessary to create all miplevels, since the 1x1 texture will never be used. For all other cases, all miplevels must be generated even though the upper ones will be unused in order to generate the lower ones. If 'levels' is zero all miplevels must always be generated.
It's important to preserve the special case, to ensure that attempting to access the non-existant level produces the correct error.
So if 'levels' is zero, the 'Levels' parameter should always be zero, otherwise it's the sum of 'levels + mLodOffset'
Also, the calls to 'creationLevels' from the TextureCubeMap methods were not quite right. Passing a zero for the second parameter causes this API to always fail, since '0' is not a power of two. There is already a version of 'creationLevels' that takes just one parameter and works correctly, so just deleting the extra parameter fixes this problem.
BUG=https://code.google.com/p/angleproject/issues/detail?id=368
TEST=Run test cases 38840, 38841, 44095, 44096, 44097, 44100, 44101, 44102 in http://ats.macromedia.com/Players/ATS/ATS10AS3/Staging/ATS.html?dynamicXML=false&wmode=direct§ion=Manual&xmlSetURL=http://fpqa.macromedia.com/crospepperbuild/XMLSets/ATS10AS3ManualPepper.xml
Review URL: https://codereview.appspot.com/6492098
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1279 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
e6a09846
|
2012-09-17T21:28:55
|
|
Returns early from createTexture if its width or height are zero.
TRAC #21594
Bug=350
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1278 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
6bc4a146
|
2012-09-06T21:28:30
|
|
Ensure texture level count accounts for lod offset.
The lower texture levels (below the lod offset) aren't used and can't be seen, so don't count them in levelCount.
BUG=
Review URL: https://codereview.appspot.com/6492084
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1275 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
ca8c1693
|
2012-08-27T16:25:43
|
|
Moved SSE2 code to separated file to allow using different compiler flags on GCC
To use SSE2 in GCC, a compiler -msse2 flag is needed. It adds both possibility to write SSE2 code in the file, but also allows compiles to optimize the whole file with SSE2. To make sure that the code works on non-SSE2 machines, moving SSE2 functions to separated file and compiling only that file with -msse2 is the common practice.
Issue=358
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1262 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
68715287
|
2012-07-12T23:28:41
|
|
Scale up non-multiple-of-4 dxt textures
D3D doesn't support DXT textures that aren't a multiple of 4 in size, so multiply the sizes by 2 or 4 so they work. Then ensure sampler parameters are set up correctly so they don't sample the unuploaded miplevels.
BUG=https://code.google.com/p/angleproject/issues/detail?id=237
TEST=
Review URL: https://codereview.appspot.com/6287045
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1222 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
07ab841a
|
2012-07-12T15:17:09
|
|
Implement Anisotropic Texture filtering support
Bug=297
Authored-by: Conor Dickinson, Cloud Party, Inc.
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1219 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
95a758f3
|
2012-07-12T15:17:06
|
|
Remove dos-style line-endings (EOL changes only)
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1218 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
9616e583
|
2012-06-22T18:27:01
|
|
Merge no-flip-rows r1142 to trunk.
Review URL: https://codereview.appspot.com/6304052
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1162 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
68145c6f
|
2012-05-31T01:14:46
|
|
Apply the depth texture correctly as the DepthStencil surface in applyRenderTarget
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1115 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
63e6afe9
|
2012-05-31T01:14:42
|
|
Ensure all getDepthStencil and getRenderTarget calls consistently handle references to the underlying d3d surfaces
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1114 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
08bfcc47
|
2012-05-31T01:14:29
|
|
Add TextureStorage support for INTZ depth textures and ensure Images never create INTZ surfaces
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1110 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
7aeab46f
|
2012-05-31T01:14:26
|
|
Factor renderability check into GetTextureUsage
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1109 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
e32d5699
|
2012-05-31T01:14:22
|
|
Pass the usage parameter into TextureStorage instead of passing a boolean
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1108 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
36884639
|
2012-05-31T01:14:18
|
|
Refactor texture usage logic to helper function
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1107 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
0c854684
|
2012-05-31T01:14:11
|
|
Report errors for unsupported Depth/stencil texture operations
Trac #20875
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1105 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
355989bc
|
2012-05-09T15:49:29
|
|
Remove duplicate error checks from Texture subImage and subImageCompressed.
Issue=306
Signed-of-by: Nicolas Capens
These errors are validated by validateSubImageParams* now, no need to do it twice.
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1083 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
4df88e8a
|
2012-05-09T15:49:24
|
|
Make TextureCubeMap size/format/compressed checks explicit about the level and face they are checking
Issue=306
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1082 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
92f49929
|
2012-05-09T15:49:19
|
|
Make Texture2D format and compression checks be explicit about the level they are checking
Issue=306
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1081 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
46f2d0a9
|
2012-05-09T15:49:06
|
|
Split RenderbufferTexture into 2D and CubeMap specific variants
Issue=306
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1078 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
bf6e5d4d
|
2012-05-09T15:49:03
|
|
Remove the unused Texture::getType method
Issue=306
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1077 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
28eb3921
|
2012-05-09T15:48:57
|
|
Move the internal format check for compressed subImage commands to the API layer
Issue=306
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1075 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2d669fce
|
2012-05-09T15:42:48
|
|
Texture: Avoid attempting to create 0 sized D3D textures
Issue=301
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1074 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
519c32ba
|
2012-05-01T15:24:05
|
|
Implement SSE2 version of loadAlphaData
http://codereview.appspot.com/6050054/
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Authored-by: Jin Yang
With this patch, my HTML5 2D canvas benchmark with Chromium on Windows7 with GPU
acceleration can boost about 4% though the most execution time is in GPU.
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1067 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
fc74c375
|
2012-04-11T17:53:24
|
|
Guard against null surface in Image::updateSurface.
Review URL: https://codereview.appspot.com/5985051
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1026 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
3b130253
|
2012-04-03T18:20:18
|
|
Make Image::lock and unlock private and call them from Image::loadData.
This is because I want loadData to be able to decide whether to use LockRect/UnlockRect or UpdateSurface as the method to load the data, depending on whether the Images are backed by textures in the default pool or not.
I think it actually cleans up the code a bit.
Also, fixed a bug in subImageCompressed. The associated WebGL conformance test now passes.
Review URL: https://codereview.appspot.com/5948043
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1013 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
a1d8059d
|
2012-01-25T21:52:10
|
|
Increase MSVC warning level to 4.
There are some exceptions, a subset of the exceptions used by Chromium. They didn't seem to be useful warnings.
In code which we don't change much, like the preprocessor, I just suppressed the warnings in the specific files rather than changing the code.
There should be no functional changes in this patch.
Review URL: https://codereview.appspot.com/5570066
git-svn-id: https://angleproject.googlecode.com/svn/trunk@964 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2678b34b
|
2012-01-18T16:29:40
|
|
Changes the pointer from textures to their renderbuffer proxies to non-refcounted (2/2)
TRAC #19335
Issue=271
Instead, the texture maintains an internal refcount which causes the pointer to behave
kind of like a "weak" shared pointer-- its reference won't prevent the renderbuffer from
being deleted, but if the renderbuffer's refcount drops to zero, the texture should set
its pointer to the renderbuffer to null so that a new one can be created at the next
getRenderbuffer call.
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/trunk@948 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
c8d46066
|
2011-12-22T19:39:14
|
|
Ensure texture storage exists before retrieving serial
Trac #19330
Signed-off-by: Nicolas Capens
In some cases we were trying to retrieve a serial from
a rendertarget texture which didn't have the storage allocated yet.
This was resulting in a 0 serial which was indistinguishable from
the case where context was just marked dirty and we assumed
the target was up-to-date. This resulted in
failing to apply the correct rendertarget and as a result
some d3d clear calls were failing (picked up by debug runtime).
git-svn-id: https://angleproject.googlecode.com/svn/trunk@929 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
4d6c6d75
|
2011-12-22T19:36:50
|
|
Only allow renderable d3dformats to be flagged as rendertarget texstorage
Trac #19356
Issue=273
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@928 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
2e566dc3
|
2011-12-22T19:36:47
|
|
rename TextureStorage renderable flag to reflect it's actual usage
Trac #19356
Issue=273
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@927 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
b9aa00b2
|
2011-12-22T19:36:42
|
|
Refactor image renderability lookup
Trac #19356
Issue=273
Signed-off-by: Nicolas Capens
Based on preliminary patch from Ken Russell
Images are never renderable directly, so renaming the Image::isRenderable function clarifies that we are
only checking on the renderability of the format.
Also factor out the lookup to a static helper function (it will be used elsewhere in the next patch)
git-svn-id: https://angleproject.googlecode.com/svn/trunk@926 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
ad0ca1c4
|
2011-12-16T23:28:52
|
|
make the renerable usage consistant and const
Trac #19259
Issue=268
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@922 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
92399aa2
|
2011-12-16T23:28:47
|
|
Add TextureStorage::getPool method
Trac #19259
Issue=268
Use it to avoid duplicate calls to getTexturePool
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@921 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
101f8697
|
2011-12-16T23:28:43
|
|
Let TextureStorage track the texture pool explicitly
Trac #19259
Issue=268
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@920 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
f5cffc91
|
2011-12-16T23:28:39
|
|
Rename various mTexture variables to mTexStorage to reflect what they really are
Trac #19259
Issue=268
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@919 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
63928d78
|
2011-12-16T23:28:34
|
|
Cache the computation of getD3DFormat
Trac #19259
Issue=268
Instead of looking this up every time, we'll just compute it when the type/format changes.
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@918 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
1dda3b18
|
2011-12-16T23:28:31
|
|
Move ConvertTextureFormatType
Trac #19259
Issue=268
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@917 736b8ea6-26fd-11df-bfd4-992fa37f6226
|
|
|
38f28cba
|
2011-12-16T23:28:26
|
|
Track the texture pool explicitly in the Image class
Trac #19259
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@916 736b8ea6-26fd-11df-bfd4-992fa37f6226
|