Split remaining graphics files on a per-API basis #2270

Merged
merged 60 commits into from Mar 25, 2014

Conversation

Projects
None yet
4 participants
Contributor

JamesLupiani commented Mar 10, 2014

Another API file split as in #2243 covering the major areas of Graphics where we have lots of platform variance. As always, additional sets of eyes are appreciated. These involve a lot of tedium and #ifdef juggling, so I'm bound to make mistakes eventually.

(Edited to expand scope of the original PR so as not to split it up among a lot of pull requests. We can cherry-pick and reopen if we need to.)

Member

mgbot commented Mar 10, 2014

Can one of the admins verify this patch?

Member

mgbot commented Mar 10, 2014

Can one of the admins verify this patch?

Owner

tomspilman commented Mar 10, 2014

@mgbot test

Member

mgbot commented Mar 10, 2014

Test FAILed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/625/

Contributor

KonajuGames commented Mar 11, 2014

@mgbot test

Member

mgbot commented Mar 11, 2014

Test FAILed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/627/

Owner

tomspilman commented Mar 11, 2014

@mgbot test

Member

mgbot commented Mar 11, 2014

Test FAILed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/628/

Owner

tomspilman commented Mar 12, 2014

@mgbot test

tomspilman closed this Mar 12, 2014

tomspilman reopened this Mar 12, 2014

Owner

tomspilman commented Mar 12, 2014

@mgbot test

Member

mgbot commented Mar 12, 2014

Test FAILed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/630/

Owner

tomspilman commented Mar 12, 2014

Some errors in the mac build:

MonoGame.Framework/Graphics/Texture3D.OpenGL.cs(19,3): error CS0246: The type or namespace name `PixelInternalFormat' could not be found. Are you missing `OpenTK.Graphics.ES11' using directive?
MonoGame.Framework/Graphics/Texture3D.OpenGL.cs(20,3): error CS0246: The type or namespace name `PixelFormat' could not be found. Are you missing `OpenTK.Graphics.ES11' or `OpenTK.Graphics.ES20' using directive?
MonoGame.Framework/Graphics/Texture3D.OpenGL.cs(21,3): error CS0246: The type or namespace name `PixelType' could not be found. Are you missing `OpenTK.Graphics.ES11' or `OpenTK.Graphics.ES20' using directive?
Contributor

JamesLupiani commented Mar 12, 2014

Wake up, @mgbot.

Owner

tomspilman commented Mar 12, 2014

@mgbot test

Member

mgbot commented Mar 12, 2014

Test FAILed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/634/

JamesLupiani added some commits Mar 12, 2014

@JamesLupiani JamesLupiani Removed duplicate file from Linux project. ffa0891
@JamesLupiani JamesLupiani Remove modified project files. 0d11efc
@JamesLupiani JamesLupiani Ifdef cleanup and API method split. 59b9654
@JamesLupiani JamesLupiani Copy Shader.cs to API-specific files. 4cb6c96
@JamesLupiani JamesLupiani Remove API-specific things from partials. 5704100
@JamesLupiani JamesLupiani Merge branch 'develop' into TextureSplit2 e2bf50c
@JamesLupiani JamesLupiani Updated build definitions for new files. e3f28aa
@JamesLupiani JamesLupiani Ifdef cleanup and API method split. d8a7032
@JamesLupiani JamesLupiani Copied ConstantBuffer.cs to API-specific files. de85c93
@JamesLupiani JamesLupiani Cull by API 1929e62
@JamesLupiani JamesLupiani OpenGL build fix. ce29f3b
@JamesLupiani JamesLupiani Ifdef cleanup and API method split. bacafd6
@JamesLupiani JamesLupiani Copied RenderTarget2D.cs to API-specific files. ab7b432
@JamesLupiani JamesLupiani API cull ca96b2e
@JamesLupiani JamesLupiani Ifdef cleanup and API method extraction 90617c3
@JamesLupiani JamesLupiani Copy RenderTarget3D.cs to API-specific files. 27b395d
@JamesLupiani JamesLupiani API method cull a9ad905
@JamesLupiani JamesLupiani Removing these from the other platforms as they're not stock and we c…
…an add them when we're ready.
72094d2
@JamesLupiani JamesLupiani Merge branch 'RenderTargetSplit' into TextureSplit2 4d2d8d6
@JamesLupiani JamesLupiani Ifdef cleanup and API method extraction 52dcb46
@JamesLupiani JamesLupiani Copy SamplerStateCollection.cs to API-specific files. 810ca95
@JamesLupiani JamesLupiani Cull API specific methods. 242aaed
@JamesLupiani JamesLupiani Ifdef cleanup and API method split 92097aa
@JamesLupiani JamesLupiani Copied BlendState.cs to API-specific files fe8c35d
@JamesLupiani JamesLupiani Cull API-specific methods bc8896c
@JamesLupiani JamesLupiani Ifdef and API method extraction b1c6ead
@JamesLupiani JamesLupiani Copied DepthStencilState.cs to API-specific files 27723a1
@JamesLupiani JamesLupiani Cull API-specific methods ccbd3c9
@JamesLupiani JamesLupiani Added missing copyright headers. 7d954f9
@JamesLupiani JamesLupiani Cleanup and API method extraction 3411e8d
@JamesLupiani JamesLupiani Copy RasterizerState.cs to API-specific files ad15668
@JamesLupiani JamesLupiani Cull API-specifics 2c16c06
@JamesLupiani JamesLupiani Adding back missing using statements on PSM 3f703e5
@JamesLupiani JamesLupiani Cleanup 8ae8f1c
@JamesLupiani JamesLupiani Copy SamplerState.cs to API-specific files 2983411
@JamesLupiani JamesLupiani Cull API specifics a7a97e2
@JamesLupiani JamesLupiani PSM build fix 0818cf7
@JamesLupiani JamesLupiani GL build fix 9384c26
@JamesLupiani JamesLupiani Ifdef cleanup 1507a79
@JamesLupiani JamesLupiani Copy VertexDeclaration.cs to API-specific files 3c06d33
@JamesLupiani JamesLupiani Cull API specifics 2044898
@JamesLupiani JamesLupiani Merge branch 'SplitGraphicsAPIs' into TextureSplit2 4c7d83c
Contributor

JamesLupiani commented Mar 13, 2014

This PR now covers the full extent of where I'm comfortable splitting out the files, unless I've missed something:

  • RenderTarget2D
  • RenderTarget3D
  • SamplerStateCollection
  • Texture
  • Texture2D
  • Texture3D
  • TextureCube
  • ConstantBuffer
  • Shader
  • BlendState
  • DepthStencilState
  • RasterizerState
  • SamplerState
  • VertexDeclaration

Some of them are pretty borderline, but I ended up splitting them after considering they'd get pretty big with the addition of other platforms.

Also, I grabbed our mac box and have been testing compilation as I go, so hopefully it'll make it through the bot with a minimum of retesting now.

Owner

tomspilman commented Mar 13, 2014

@mgbot test

Member

mgbot commented Mar 14, 2014

Test PASSed.
Refer to this link for build results: http://build.monogame.net/job/PullRequestTester/638/

Owner

tomspilman commented Mar 14, 2014

Woot!

Big shuffle of code... could use a few more people to skim thru the changes to look for issues.

Contributor

KonajuGames commented Mar 14, 2014

I will do so tonight.​

Contributor

KonajuGames commented Mar 14, 2014

That's a lot of changes to go through.

Contributor

KonajuGames commented Mar 14, 2014

Haven't seen anything scary so far.

Owner

tomspilman commented Mar 25, 2014

The build server is really broken at this moment, but this PR was validated before it went down and is good to merge.

KonajuGames merged commit 2937802 into MonoGame:develop Mar 25, 2014

1 check passed

default Merged build finished.
Details
Contributor

KonajuGames commented Mar 25, 2014

Done.

Contributor

JamesLupiani commented Mar 25, 2014

Thanks!

JamesLupiani deleted the SickheadGames:TextureSplit2 branch May 28, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment