ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,933 Commits 6 Branches 12 Tags 1.3 GiB
Commit Graph

1400 Commits

Author SHA1 Message Date
Ryan Houdek 692e39d1bb Merge branch 'arm-noglsl' 2013-02-27 02:22:08 +00:00
Jordan Woyak a680d17eef Buildfix. 2013-02-26 19:59:33 -06:00
Jordan Woyak f1c990069c Yell at the user if they change window size while dumping frames, and some other avi dumping stuff. 2013-02-26 20:47:48 -05:00
Ryan Houdek 717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Jordan Woyak 6e6d8af6dd Revert "Don't load level 0 twice for 1-level textures in DX11." and fix it properly. 
All backend TextureCaches now load level 0 in CreateTexture.

This reverts commit 294cb165ba.
 2013-02-20 05:42:22 -06:00
NeoBrainX 19ab5bf50d TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs. 2013-02-18 17:14:56 +01:00
Jordan Woyak d994e56b60 Changes/cleanup to TextureCache::Load and other mipmap related code. 
The significant change is what is now line 520 of TextureCacheBase.cpp:
((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1)
to
TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);

Fixes issue 5328.
Fixes issue 5461.
 2013-02-15 22:56:29 -06:00
NeoBrainX ed0abc9dc5 Merge branch 'mipmap_fixes'. 2013-02-07 20:40:33 +01:00
NeoBrainX 6870c1fdd5 Fix some potential issues when blending on EFB formats without alpha. 
Clean up state transition tables.
 2013-02-07 18:01:24 +01:00
Jordan Woyak 0e04e0c305 Fix some shadowing warnings. 2013-01-29 16:43:22 -06:00
Ryan Houdek 73eb98ed8e Move swap control to the host specific GLInterface files. 2013-01-24 10:31:08 -06:00
lioncash 0ef3bd9c77 Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)." 
Turns out I was wrong in my previous commit. My bad.

This reverts commit 8743166663.
 2013-01-16 15:46:11 -05:00
lioncash 8743166663 Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names). 
This also gets rid of some more typecasts in some cases.
 2013-01-16 09:42:51 -05:00
NeoBrainX be706a3977 Disable color writing when alpha test always fails. 2013-01-08 18:56:01 +01:00
NeoBrainX d26bcb0847 Move alpha pretest to BPMemory.h and rename a bunch of alpha testing related stuff 2013-01-08 18:56:01 +01:00
NeoBrainX e979b2d4a2 DX11: Fix a small mistake. 
Remove some incorrect and/or confusing comments.

Fixes issue 5251. Thanks to limburgerite :)
 2013-01-08 18:16:48 +01:00
Ryan Houdek d0301ca89d Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06:00
degasus 30dd9c2e17 always calls glBindBuffer(0) after disabling vao 2012-12-29 12:50:42 +01:00
degasus e9d00bfeeb revert RasterFont optimization 
isn't needed and also not tested and buggy
 2012-12-29 00:37:50 +01:00
degasus db5f4c8c20 fix byte order in osd rasterfont 2012-12-26 23:48:33 +01:00
Ryan Houdek 01cdcc83a3 Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated. 2012-12-26 13:15:19 -06:00
Ryan Houdek 67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek e2489196e4 Got overzealous. We aren't removing CG quite yet with this branch. 2012-12-26 00:41:25 -06:00
Ryan Houdek 9a58f9a3bb Rename another function... 2012-12-26 00:34:09 -06:00
Ryan Houdek f4e7a280a9 Remove cg.lib from some files for Windows and renaming a function. 2012-12-26 00:07:43 -06:00
Ryan Houdek 01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00
degasus bff0faea2d Merge branch 'immediate-removal' 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
 2012-12-25 12:39:00 +01:00
degasus 399a6af66d revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough 2012-12-25 12:22:02 +01:00
NeoBrainX 2fedab3bad OGL: Make OSD messages fade out properly instead of having them disappear spontaneously. 2012-12-24 19:50:16 +01:00
Ryan Houdek 296b9b1c16 Small bit of clean up in GLES-software. 2012-12-24 09:37:12 -06:00
Ryan Houdek b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
degasus 79a7ce4827 move glBindBuffer and glBindVertexArray out of VertexManager 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:52 -06:00
degasus 09274e2483 Check texture params before updateing them 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:48 -06:00
degasus 61836f8c51 helper for compiling glsl 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:44 -06:00
degasus 48812f7bf7 update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:39 -06:00
degasus 1bd21f44b2 custom shader for RasterFont, fix color support 
OpenGL2.0 compatible

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:36 -06:00
degasus 23a3336f9a increase hash size to u64 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:32 -06:00
degasus 75dd48247f initial release of new RasterFont without color support 
this new design will once create a texture for all chars.
while rendering a string, a list of polygons (position on screen + texture)
for this string is generated on the fly and print at once by glDrawArrays.
atm, there is no support for colors, so everything will display white.

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:28 -06:00
degasus c207422987 using of vao, warning: ARB_vertex_array_object is needed 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:25 -06:00
degasus 5c8800968a also check for vbo updates in EncodeToRamUsingShader 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:22 -06:00
degasus 1f1b32b663 only update vbo on changes in XFBSource::Draw 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:19 -06:00
degasus 34b1451fbe cache vbos in TextureCache::TCacheEntry::FromRenderTarget 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:15 -06:00
degasus d0c4332d99 don't update vbo, if there are no changes in Renderer::Swap 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:13 -06:00
degasus bbcb442983 in the end, also Renderer::Swap in vbo 
two last draw-calls are missing:
VertexManager::Draw (see Graphic_Update branch)
RasterFont::printString (perhaps reimplement with an texture)

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:10 -06:00
degasus b41c06a9ac EncodeToRamUsingShader in vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:05 -06:00
degasus 8ea2ddbc50 XFBSource::Draw in vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:59 -06:00
degasus d44228f1b7 TextureCache::TCacheEntry::FromRenderTarget as vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:56 -06:00
degasus 6b3125728b use vbo for ShowEFBCopyRegions 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:53 -06:00
degasus 8b62be2025 fix ShowEFBCopyRegions 
those fancy colors were the result of the usage of non-allocated heap

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:49 -06:00
degasus 6864b40e26 reset glEnableClientState befor every draw 
should be done with VAO, but atm, this is not possible :-(
this also partial revert the fix in fb92c338af (activating texture0 globally).

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:46 -06:00