forked from eden-emu/eden
		
	gl_state: Amend compilation warnings
Makes float -> integral conversions explicit via casts and also silences a sign conversion warning.
This commit is contained in:
		
							parent
							
								
									65bd03d74c
								
							
						
					
					
						commit
						9a0fb7d9fb
					
				
					 2 changed files with 4 additions and 3 deletions
				
			
		|  | @ -266,7 +266,8 @@ void OpenGLState::ApplyViewport() const { | |||
|         const auto& updated = viewports[0]; | ||||
|         if (updated.x != current.x || updated.y != current.y || updated.width != current.width || | ||||
|             updated.height != current.height) { | ||||
|             glViewport(updated.x, updated.y, updated.width, updated.height); | ||||
|             glViewport(static_cast<GLint>(updated.x), static_cast<GLint>(updated.y), | ||||
|                        static_cast<GLsizei>(updated.width), static_cast<GLsizei>(updated.height)); | ||||
|         } | ||||
|         if (updated.depth_range_near != current.depth_range_near || | ||||
|             updated.depth_range_far != current.depth_range_far) { | ||||
|  | @ -313,7 +314,7 @@ void OpenGLState::ApplyGlobalBlending() const { | |||
|     } | ||||
| } | ||||
| 
 | ||||
| void OpenGLState::ApplyTargetBlending(int target, bool force) const { | ||||
| void OpenGLState::ApplyTargetBlending(std::size_t target, bool force) const { | ||||
|     const Blend& updated = blend[target]; | ||||
|     const Blend& current = cur_state.blend[target]; | ||||
|     const bool blend_changed = updated.enabled != current.enabled || force; | ||||
|  |  | |||
|  | @ -208,7 +208,7 @@ private: | |||
|     void ApplyPrimitiveRestart() const; | ||||
|     void ApplyStencilTest() const; | ||||
|     void ApplyViewport() const; | ||||
|     void ApplyTargetBlending(int target, bool force) const; | ||||
|     void ApplyTargetBlending(std::size_t target, bool force) const; | ||||
|     void ApplyGlobalBlending() const; | ||||
|     void ApplyBlending() const; | ||||
|     void ApplyLogicOp() const; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Lioncash
						Lioncash